Merge branch 'master' into ticket

[stg.git] / projects / sgconf / Makefile

diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile
index c5f3e4bf0309dc39b4e34924dd5fa6931f09cc3e..3a64cb6147e9358101bedeed0d8616975233054a 100644 (file)
--- a/projects/sgconf/Makefile
+++ b/projects/sgconf/Makefile
@@ -7,16 +7,18 @@ include ../../Makefile.conf
 PROG = sgconf
 
 SRCS = ./main.cpp \
 PROG = sgconf
 
 SRCS = ./main.cpp \

-       ./common_sg.cpp \

        ./options.cpp \
        ./options.cpp \

+       ./api_action.cpp \

        ./actions.cpp \
        ./admins.cpp \
        ./tariffs.cpp \
        ./users.cpp \
        ./actions.cpp \
        ./admins.cpp \
        ./tariffs.cpp \
        ./users.cpp \

+       ./services.cpp \
+       ./corps.cpp \
+       ./info.cpp \

        ./xml.cpp
 
        ./xml.cpp
 

-STGLIBS = conffiles \
-          srvconf \
+STGLIBS = srvconf \

           crypto \
           common
 
           crypto \
           common
 


@@ -63,11 +65,7 @@ $(PROG): $(OBJS)
        $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
 
 clean:
        $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
 
 clean:

-       rm -f deps $(PROG) *.o tags *.*~ .OS
-       rm -f .OS
-       rm -f .store
-       rm -f .db.sql
-       rm -f core*
+       rm -f deps $(PROG) *.o

        $(MAKE) -C $(DIR_LIBSRC) clean
 
 distclean: clean
        $(MAKE) -C $(DIR_LIBSRC) clean
 
 distclean: clean


@@ -77,9 +75,11 @@ install: install-bin
 
 install-bin:
 ifeq ($(DEBUG), yes)
 
 install-bin:
 ifeq ($(DEBUG), yes)

-       install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/sbin
+       install -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)

 else
 else

-       install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/sbin
+       install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)

 endif
        $(MAKE) -C $(DIR_LIBSRC) install
 
 endif
        $(MAKE) -C $(DIR_LIBSRC) install