X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/d084d9ae9f7bcd7f7d1926e7eeae921dbad49273..34c6c923ebcbbca2527a7423f1d696b0bdb2d765:/projects/sgconf/Makefile?ds=inline

diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile
index 52a70ae8..795c2522 100644
--- a/projects/sgconf/Makefile
+++ b/projects/sgconf/Makefile
@@ -7,29 +7,21 @@ include ../../Makefile.conf
 PROG = sgconf
 
 SRCS = ./main.cpp \
-       ./options.cpp \
-       ./api_action.cpp \
-       ./actions.cpp \
-       ./admins.cpp \
-       ./tariffs.cpp \
-       ./users.cpp \
-       ./services.cpp \
-       ./corps.cpp \
-       ./xml.cpp
-
-STGLIBS = srvconf \
+       ./common_sg.cpp
+
+STGLIBS = conffiles \
+          srvconf \
           crypto \
           common
 
 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
 STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
-LIBS += $(addprefix -lstg,$(STGLIBS)) -lexpat $(LIB_THREAD)
+LIBS += $(addprefix -lstg,$(STGLIBS)) -lexpat $(LIB_THREAD) $(LIBICONV)
 
 ifeq ($(OS),linux)
 else
-LIBS += -lc \
-        -liconv
+LIBS += -lc
 endif
 
 SEARCH_DIRS = -I ../../include
@@ -64,7 +56,11 @@ $(PROG): $(OBJS)
 	$(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
 
 clean:
-	rm -f deps $(PROG) *.o
+	rm -f deps $(PROG) *.o tags *.*~ .OS
+	rm -f .OS
+	rm -f .store
+	rm -f .db.sql
+	rm -f core*
 	$(MAKE) -C $(DIR_LIBSRC) clean
 
 distclean: clean
@@ -74,9 +70,11 @@ install: install-bin
 
 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
-	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
 
@@ -94,7 +92,7 @@ endif
 endif
 endif
 
-deps: $(SRCS) ../../Makefile.conf
+deps:	$(SRCS) ../../Makefile.conf
 	$(MAKE) -C $(DIR_LIBSRC)
 	@>deps ;\
 	for file in $(SRCS); do\