diff options
| author | Haru <haru@dotalux.com> | 2013-09-18 05:11:10 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2013-09-18 16:29:18 +0200 |
| commit | babdf60b0339ac4249072a4ba13d27052e0b2fc5 (patch) | |
| tree | adfc85bbae73830081098ae7dc56325448b8cfc7 /src/test | |
| parent | 78c7c6bf04a6c96d92524ae37ad165e65f599eb8 (diff) | |
| download | hercules-babdf60b0339ac4249072a4ba13d27052e0b2fc5.tar.gz hercules-babdf60b0339ac4249072a4ba13d27052e0b2fc5.tar.bz2 hercules-babdf60b0339ac4249072a4ba13d27052e0b2fc5.tar.xz hercules-babdf60b0339ac4249072a4ba13d27052e0b2fc5.zip | |
Makefiles improvements and cleanup
This should resolve #138 (please reopen or comment on it if it's not the
case). Special thanks to Takkun for helping to reproduce the issue.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/Makefile.in | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/src/test/Makefile.in b/src/test/Makefile.in index 56cbfefc9..f17c43202 100644 --- a/src/test/Makefile.in +++ b/src/test/Makefile.in @@ -1,20 +1,22 @@ COMMON_H = $(shell ls ../common/*.h) +CONFIG_H = $(shell ls ../config/*.h ../config/*/*.h) -MT19937AR_OBJ = ../../3rdparty/mt19937ar/mt19937ar.o -MT19937AR_H = ../../3rdparty/mt19937ar/mt19937ar.h -MT19937AR_INCLUDE = -I../../3rdparty/mt19937ar +MT19937AR_D = ../../3rdparty/mt19937ar +MT19937AR_OBJ = $(MT19937AR_D)/mt19937ar.o +MT19937AR_H = $(MT19937AR_D)/mt19937ar.h +MT19937AR_INCLUDE = -I$(MT19937AR_D) -LIBCONFIG_OBJ = ../../3rdparty/libconfig/libconfig.o ../../3rdparty/libconfig/grammar.o \ - ../../3rdparty/libconfig/scanctx.o ../../3rdparty/libconfig/scanner.o ../../3rdparty/libconfig/strbuf.o -LIBCONFIG_H = ../../3rdparty/libconfig/libconfig.h ../../3rdparty/libconfig/grammar.h \ - ../../3rdparty/libconfig/parsectx.h ../../3rdparty/libconfig/scanctx.h ../../3rdparty/libconfig/scanner.h \ - ../../3rdparty/libconfig/strbuf.h ../../3rdparty/libconfig/wincompat.h -LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig +LIBCONFIG_D = ../../3rdparty/libconfig +LIBCONFIG_OBJ = $(addprefix $(LIBCONFIG_D)/, libconfig.o grammar.o scanctx.o \ + scanner.o strbuf.o) +LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \ + scanctx.h scanner.h strbuf.h wincompat.h) +LIBCONFIG_INCLUDE = -I$(LIBCONFIG_D) TEST_SPINLOCK_OBJ=obj/test_spinlock.o TEST_SPINLOCK_H= -TEST_SPINLOCK_DEPENDS=obj $(TEST_SPINLOCK_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) +TEST_SPINLOCK_DEPENDS=$(TEST_SPINLOCK_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) @SET_MAKE@ @@ -22,7 +24,7 @@ CC = @CC@ export CC ##################################################################### -.PHONY :all test_spinlock +.PHONY: all test_spinlock all: test_spinlock @@ -46,19 +48,23 @@ test_spinlock: $(TEST_SPINLOCK_DEPENDS) # login object files -obj/%.o: %.c $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) +obj/%.o: %.c $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj @echo " CC $<" @$(CC) @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) -DWITH_SQL @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing object files ../common/obj_all/common.a: + @echo " MAKE $@" @$(MAKE) -C ../common sql ../common/obj_sql/common_sql.a: + @echo " MAKE $@" @$(MAKE) -C ../common sql $(MT19937AR_OBJ): - @$(MAKE) -C ../../3rdparty/mt19937ar + @echo " MAKE $@" + @$(MAKE) -C $(MT19937AR_D) $(LIBCONFIG_OBJ): - @$(MAKE) -C ../../3rdparty/libconfig + @echo " MAKE $@" + @$(MAKE) -C $(LIBCONFIG_D) |