Ticket 37. formatTime() changed to x2str() for the ChangePolicyTimeout

[stg.git] / projects / sgconf / Makefile

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

-       ./options.cpp \
-       ./api_action.cpp \
-       ./actions.cpp \
-       ./admins.cpp \
-       ./tariffs.cpp \
-       ./users.cpp \
-       ./services.cpp \
-       ./corps.cpp \
-       ./info.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)))
 
           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
 
 ifeq ($(OS),linux)
 else

-LIBS += -lc \
-        -liconv
+LIBS += -lc

 endif
 
 SEARCH_DIRS = -I ../../include
 endif
 
 SEARCH_DIRS = -I ../../include


@@ -65,7 +56,11 @@ $(PROG): $(OBJS)
        $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
 
 clean:
        $(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
        $(MAKE) -C $(DIR_LIBSRC) clean
 
 distclean: clean


@@ -97,7 +92,7 @@ endif
 endif
 endif
 
 endif
 endif
 

-deps: $(SRCS) ../../Makefile.conf
+deps:  $(SRCS) ../../Makefile.conf

        $(MAKE) -C $(DIR_LIBSRC)
        @>deps ;\
        for file in $(SRCS); do\
        $(MAKE) -C $(DIR_LIBSRC)
        @>deps ;\
        for file in $(SRCS); do\