From: Maxim Mamontov Date: Thu, 5 May 2011 10:52:20 +0000 (+0300) Subject: Update build system X-Git-Tag: 2.407-p1~34 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/40ec7c02603812a6b65d648e7bded4f8c088cb0e Update build system --- diff --git a/projects/sgauthstress/Makefile b/projects/sgauthstress/Makefile index 1a007ec4..a90e9b6d 100644 --- a/projects/sgauthstress/Makefile +++ b/projects/sgauthstress/Makefile @@ -3,7 +3,7 @@ include ../../Makefile.conf PROG = sgauthstress SRCS = ./main.cpp \ - ./settings_impl.cpp \ + ./settings.cpp \ ./store_loader.cpp STGLIBS = -lstgcrypto \ @@ -38,17 +38,13 @@ libs: 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: - 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_PLUGINS) clean distclean: clean rm -f ../../Makefile.conf @@ -64,8 +60,7 @@ endif deps: $(SRCS) ../../Makefile.conf $(MAKE) -C $(DIR_LIBSRC) includes @>deps ;\ - ./make_css.sh 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 diff --git a/projects/sgauthstress/build b/projects/sgauthstress/build index e4b4281f..af3d4639 100755 --- a/projects/sgauthstress/build +++ b/projects/sgauthstress/build @@ -69,6 +69,7 @@ STG_LIBS="logger.lib locker.lib crypto.lib common.lib + conffiles.lib dotconfpp.lib ia.lib"