Update build system

diff --git a/projects/sgauthstress/Makefile b/projects/sgauthstress/Makefile
index 1a007ec4a05321a787e3706c9e7aabfc5064426c..a90e9b6da34173300e2f5b67e70cb656c2d4063a 100644 (file)
--- a/projects/sgauthstress/Makefile
+++ b/projects/sgauthstress/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.conf
 PROG = sgauthstress
 
 SRCS = ./main.cpp \
 PROG = sgauthstress
 
 SRCS = ./main.cpp \

-       ./settings_impl.cpp \
+       ./settings.cpp \

        ./store_loader.cpp
 
 STGLIBS =  -lstgcrypto \
        ./store_loader.cpp
 
 STGLIBS =  -lstgcrypto \


@@ -38,17 +38,13 @@ libs:
 plugins: libs 
        $(MAKE) -C $(DIR_PLUGINS)
 
 plugins: libs 
        $(MAKE) -C $(DIR_PLUGINS)
 

-$(PROG): $(OBJS) $(STGLIBS) 
-       $(CC) $^ $(LDFLAGS) -o $(PROG) $(LIBS)
+$(PROG): $(OBJS) libs
+       $(CXX) $(OBJS) $(LDFLAGS) $(LIBS) $(STGLIBS) -o $(PROG)

 
 clean:
 
 clean:

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

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

+       $(MAKE) -C $(DIR_PLUGINS) clean

 
 distclean: clean
        rm -f ../../Makefile.conf
 
 distclean: clean
        rm -f ../../Makefile.conf


@@ -64,8 +60,7 @@ endif
 deps:  $(SRCS) ../../Makefile.conf
        $(MAKE) -C $(DIR_LIBSRC) includes
        @>deps ;\
 deps:  $(SRCS) ../../Makefile.conf
        $(MAKE) -C $(DIR_LIBSRC) includes
        @>deps ;\

-       ./make_css.sh

        for file in $(SRCS); do\
        for file in $(SRCS); do\

-         echo "`$(CC) $(CXXFLAGS) $(SEARCH_DIRS) -MM $$file` Makefile" >> deps ;\
+         echo "`$(CC) $(CXXFLAGS) $(SEARCH_DIRS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\

          echo -e '\t$$(CC) -c $$< $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS)' >> deps ;\
        done
          echo -e '\t$$(CC) -c $$< $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS)' >> deps ;\
        done

diff --git a/projects/sgauthstress/build b/projects/sgauthstress/build
index e4b4281fc81ccf3497700f3fe9c7e80236fe99b0..af3d4639298821ff012c6f6ebe70008aed2947a6 100755 (executable)
--- a/projects/sgauthstress/build
+++ b/projects/sgauthstress/build
@@ -69,6 +69,7 @@ STG_LIBS="logger.lib
           locker.lib
           crypto.lib 
          common.lib 
           locker.lib
           crypto.lib 
          common.lib 

+          conffiles.lib

           dotconfpp.lib
          ia.lib"
 
           dotconfpp.lib
          ia.lib"