From 82a1c702dcd68ec5370203c41a78958650f30d66 Mon Sep 17 00:00:00 2001 From: lighta Date: Sat, 3 May 2014 03:05:58 -0400 Subject: [PATCH] Upd Makefile Fix small typo in intif.h, ifndef was being unused. Upd Makefile to simplify libconfig inclusion --- .gitignore | 2 ++ 3rdparty/libconfig/Makefile.in | 24 ++++++++++++++------- src/char/Makefile.in | 28 ++++++++++++------------- src/common/Makefile.in | 38 +++++++++++++++------------------- src/common/mutex.c | 2 +- src/login/Makefile.in | 28 ++++++++++++------------- src/map/Makefile.in | 31 ++++++++++++--------------- src/map/intif.h | 2 +- src/test/Makefile.in | 11 ++++------ src/tool/Makefile.in | 32 +++++++++++----------------- 10 files changed, 95 insertions(+), 103 deletions(-) diff --git a/.gitignore b/.gitignore index 4c2548685b..f60782fecd 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ Thumbs.db # /3rdparty/libconfig/ /3rdparty/libconfig/Makefile /3rdparty/libconfig/*.o +/3rdparty/libconfig/obj # /3rdparty/mt19937ar/ /3rdparty/mt19937ar/Makefile @@ -123,3 +124,4 @@ Thumbs.db /vcproj-9/login-server_sql /vcproj-9/map-server_sql /vcproj-9/mapcache +/conf/.tmp-desd_conf.yml diff --git a/3rdparty/libconfig/Makefile.in b/3rdparty/libconfig/Makefile.in index ee17298b4d..c35b452f7a 100644 --- a/3rdparty/libconfig/Makefile.in +++ b/3rdparty/libconfig/Makefile.in @@ -1,26 +1,36 @@ -LIBCONFIG_OBJ = libconfig.o grammar.o scanctx.o scanner.o strbuf.o -LIBCONFIG_H = libconfig.h grammar.h parsectx.h scanctx.h scanner.h strbuf.h wincompat.h +LIBCONFIG_OBJ = $(shell ls *.c | sed -e "s/\.c/\.o/g") +LIBCONFIG_DIR_OBJ = $(LIBCONFIG_OBJ:%=obj/%) +LIBCONFIG_H = $(shell ls *.h) +LIBCONFIG_AR = obj/libconfig.a @SET_MAKE@ ##################################################################### .PHONY : all clean help -all: $(LIBCONFIG_OBJ) +all: $(LIBCONFIG_AR) clean: @echo " CLEAN libconfig" - @rm -rf *.o + @rm -rf obj *.o help: @echo "possible targets are 'all' 'clean' 'help'" - @echo "'all' - builds $(LIBCONFIG_OBJ)" - @echo "'clean' - deletes $(LIBCONFIG_OBJ)" + @echo "'all' - builds $(LIBCONFIG_DIR_OBJ)" + @echo "'clean' - deletes $(LIBCONFIG_DIR_OBJ)" @echo "'help' - outputs this message" ##################################################################### -%.o: %.c $(LIBCONFIG_H) +obj_dir: + @echo " MKDIR obj" + @-mkdir obj + +obj/%.o: %.c $(LIBCONFIG_H) @echo " CC $<" @@CC@ @CFLAGS@ @DEFS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + +$(LIBCONFIG_AR): obj_dir $(LIBCONFIG_DIR_OBJ) + @echo " AR $@" + @@AR@ rcs obj/libconfig.a $(LIBCONFIG_DIR_OBJ) diff --git a/src/char/Makefile.in b/src/char/Makefile.in index 97a406aa22..4866464104 100644 --- a/src/char/Makefile.in +++ b/src/char/Makefile.in @@ -1,22 +1,21 @@ COMMON_H = $(shell ls ../common/*.h) +COMMON_AR = ../common/obj_all/common.a +COMMON_SQL_AR = ../common/obj_sql/common_sql.a +COMMON_INCLUDE = -I../common/ MT19937AR_OBJ = ../../3rdparty/mt19937ar/mt19937ar.o MT19937AR_H = ../../3rdparty/mt19937ar/mt19937ar.h MT19937AR_INCLUDE = -I../../3rdparty/mt19937ar -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_H = $(shell ls ../../3rdparty/libconfig/*.h) +LIBCONFIG_AR = ../../3rdparty/libconfig/obj/libconfig.a LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig COMMON_SQL_OBJ = ../common/obj_sql/sql.o COMMON_H = ../common/sql.h -CHAR_OBJ = char.o inter.o int_party.o int_guild.o \ - int_storage.o int_pet.o int_homun.o int_mail.o int_auction.o int_quest.o int_mercenary.o int_elemental.o +CHAR_OBJ = $(shell ls *.c | sed -e "s/\.c/\.o/g") CHAR_SQL_OBJ = $(CHAR_OBJ:%=obj_sql/%) CHAR_H = $(shell ls ../char/*.h) @@ -50,9 +49,10 @@ help: ##################################################################### -char-server: obj_sql $(CHAR_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a + +char-server: obj_sql $(CHAR_SQL_OBJ) $(LIBCONFIG_AR) $(COMMON_SQL_AR) $(COMMON_AR) @echo " LD @OCHR@@EXEEXT@" - @@CC@ @LDFLAGS@ -o ../../@OCHR@@EXEEXT@ $(CHAR_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@ + @@CC@ @LDFLAGS@ -o ../../@OCHR@@EXEEXT@ $(CHAR_SQL_OBJ) $(LIBCONFIG_AR) $(COMMON_SQL_AR) $(COMMON_AR) $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@ needs_mysql: @echo "MySQL not found or disabled by the configure script" @@ -64,17 +64,17 @@ obj_sql: obj_sql/%.o: %.c $(CHAR_H) $(COMMON_H) $(COMMON_SQL_H) $(MT19937AR_H) $(LIBCONFIG_H) @echo " CC $<" - @@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CC@ @CFLAGS@ $(COMMON_INCLUDE) $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing object files -../common/obj_all/common.a: +$(COMMON_AR): @$(MAKE) -C ../common sql -../common/obj_sql/common_sql.a: +$(COMMON_SQL_AR): @$(MAKE) -C ../common sql -MT19937AR_OBJ: +$(MT19937AR_OBJ): @$(MAKE) -C ../../3rdparty/mt19937ar -LIBCONFIG_OBJ: +$(LIBCONFIG_AR): @$(MAKE) -C ../../3rdparty/libconfig diff --git a/src/common/Makefile.in b/src/common/Makefile.in index 90ea2c74d2..f11fb915ae 100644 --- a/src/common/Makefile.in +++ b/src/common/Makefile.in @@ -1,25 +1,21 @@ -COMMON_OBJ = obj_all/core.o obj_all/socket.o obj_all/timer.o obj_all/db.o \ - obj_all/nullpo.o obj_all/malloc.o obj_all/showmsg.o obj_all/strlib.o obj_all/utils.o \ - obj_all/grfio.o obj_all/mapindex.o obj_all/ers.o obj_all/md5calc.o \ - obj_all/minicore.o obj_all/minisocket.o obj_all/minimalloc.o obj_all/random.o obj_all/des.o \ - obj_all/conf.o obj_all/thread.o obj_all/mutex.o obj_all/raconf.o obj_all/mempool.o \ - obj_all/msg_conf.o obj_all/cli.o - +#COMMON_OBJ = $(ls *.c | grep -viw sql.c | sed -e "s/\.c/\.o/g") +COMMON_OBJ = core.o socket.o timer.o db.o nullpo.o malloc.o showmsg.o strlib.o utils.o \ + grfio.o mapindex.o ers.o md5calc.o minicore.o minisocket.o minimalloc.o random.o des.o \ + conf.o thread.o mutex.o raconf.o mempool.o msg_conf.o cli.o +COMMON_DIR_OBJ = $(COMMON_OBJ:%=obj_all/%) COMMON_H = $(shell ls ../common/*.h) - COMMON_SQL_OBJ = obj_sql/sql.o COMMON_SQL_H = sql.h +COMMON_AR = obj_all/common.a +COMMON_SQL_AR = obj_sql/common_sql.a MT19937AR_OBJ = ../../3rdparty/mt19937ar/mt19937ar.o MT19937AR_H = ../../3rdparty/mt19937ar/mt19937ar.h MT19937AR_INCLUDE = -I../../3rdparty/mt19937ar -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_H = $(shell ls ../../3rdparty/libconfig/*.h) +LIBCONFIG_AR = ../../3rdparty/libconfig/obj/libconfig.a LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig HAVE_MYSQL=@HAVE_MYSQL@ @@ -64,18 +60,18 @@ obj_sql: @echo " MKDIR obj_sql" @-mkdir obj_sql -obj_all/common.a: $(COMMON_OBJ) +$(COMMON_AR): $(COMMON_DIR_OBJ) @echo " AR $@" - @@AR@ rcs obj_all/common.a $(COMMON_OBJ) + @@AR@ rcs $(COMMON_AR) $(COMMON_DIR_OBJ) -obj_sql/common_sql.a: $(COMMON_SQL_OBJ) +$(COMMON_SQL_AR): $(COMMON_SQL_OBJ) @echo " AR $@" - @@AR@ rcs obj_sql/common_sql.a $(COMMON_SQL_OBJ) + @@AR@ rcs $(COMMON_SQL_AR) $(COMMON_SQL_OBJ) -common: obj_all $(COMMON_OBJ) $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) obj_all/common.a +common: obj_all $(COMMON_DIR_OBJ) $(MT19937AR_OBJ) $(LIBCONFIG_AR) $(COMMON_AR) -common_sql: obj_sql $(COMMON_SQL_OBJ) obj_sql/common_sql.a +common_sql: obj_sql $(COMMON_SQL_OBJ) $(COMMON_SQL_AR) obj_all/%.o: %.c $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) @echo " CC $<" @@ -91,8 +87,8 @@ obj_sql/%.o: %.c $(COMMON_H) $(COMMON_SQL_H) $(LIBCONFIG_H) # missing object files -MT19937AR_OBJ: +$(MT19937AR_OBJ): @$(MAKE) -C ../../3rdparty/mt19937ar -LIBCONFIG_OBJ: +$(LIBCONFIG_AR): @$(MAKE) -C ../../3rdparty/libconfig diff --git a/src/common/mutex.c b/src/common/mutex.c index 251c727c60..6b4f551197 100644 --- a/src/common/mutex.c +++ b/src/common/mutex.c @@ -90,7 +90,7 @@ void ramutex_lock( ramutex m ){ bool ramutex_trylock( ramutex m ){ #ifdef WIN32 - if(TryEnterCriticalSection(&m->hMutex) != FALSE) + if(TryEnterCriticalSection(&m->hMutex) == TRUE) return true; return false; diff --git a/src/login/Makefile.in b/src/login/Makefile.in index d6110ae53b..0422202db8 100644 --- a/src/login/Makefile.in +++ b/src/login/Makefile.in @@ -1,20 +1,20 @@ COMMON_H = $(shell ls ../common/*.h) +COMMON_AR = ../common/obj_all/common.a +COMMON_SQL_AR = ../common/obj_sql/common_sql.a +COMMON_INCLUDE = -I../common MT19937AR_OBJ = ../../3rdparty/mt19937ar/mt19937ar.o MT19937AR_H = ../../3rdparty/mt19937ar/mt19937ar.h MT19937AR_INCLUDE = -I../../3rdparty/mt19937ar -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_H = $(shell ls ../../3rdparty/libconfig/*.h) +LIBCONFIG_AR = ../../3rdparty/libconfig/obj/libconfig.a LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig -LOGIN_OBJ = login.o account_sql.o ipban_sql.o loginlog_sql.o +LOGIN_OBJ = $(shell ls *.c | sed -e "s/\.c/\.o/g") LOGIN_SQL_OBJ = $(LOGIN_OBJ:%=obj_sql/%) -LOGIN_H = login.h account.h ipban.h loginlog.h +LOGIN_H = $(shell ls *.h) HAVE_MYSQL=@HAVE_MYSQL@ ifeq ($(HAVE_MYSQL),yes) @@ -58,26 +58,26 @@ obj_sql: #executables -login-server: obj_sql $(LOGIN_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) +login-server: obj_sql $(LOGIN_SQL_OBJ) $(COMMON_SQL_AR) $(COMMON_AR) $(MT19937AR_OBJ) @echo " LD @OLOG@@EXEEXT@" - @@CC@ @LDFLAGS@ -o ../../@OLOG@@EXEEXT@ $(LOGIN_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@ + @@CC@ @LDFLAGS@ -o ../../@OLOG@@EXEEXT@ $(LOGIN_SQL_OBJ) $(COMMON_SQL_AR) $(COMMON_AR) $(MT19937AR_OBJ) $(LIBCONFIG_AR) @LIBS@ @MYSQL_LIBS@ # login object files obj_sql/%.o: %.c $(LOGIN_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) @echo " CC $<" - @@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) -DWITH_SQL @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CC@ @CFLAGS@ $(COMMON_INCLUDE) $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) -DWITH_SQL @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing object files -../common/obj_all/common.a: +$(COMMON_AR): @$(MAKE) -C ../common sql -../common/obj_sql/common_sql.a: +$(COMMON_SQL_AR): @$(MAKE) -C ../common sql -MT19937AR_OBJ: +$(MT19937AR_OBJ): @$(MAKE) -C ../../3rdparty/mt19937ar -LIBCONFIG_OBJ: +$(LIBCONFIG_AR): @$(MAKE) -C ../../3rdparty/libconfig diff --git a/src/map/Makefile.in b/src/map/Makefile.in index bd2db827ba..6cfda3baaf 100644 --- a/src/map/Makefile.in +++ b/src/map/Makefile.in @@ -1,23 +1,18 @@ COMMON_H = $(shell ls ../common/*.h) +COMMON_AR = ../common/obj_all/common.a +COMMON_SQL_AR = ../common/obj_sql/common_sql.a +COMMON_INCLUDE = -I../common/ MT19937AR_OBJ = ../../3rdparty/mt19937ar/mt19937ar.o MT19937AR_H = ../../3rdparty/mt19937ar/mt19937ar.h MT19937AR_INCLUDE = -I../../3rdparty/mt19937ar -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_H = $(shell ls ../../3rdparty/libconfig/*.h) +LIBCONFIG_AR = ../../3rdparty/libconfig/obj/libconfig.a LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig -MAP_OBJ = map.o chrif.o clif.o pc.o status.o npc.o \ - npc_chat.o chat.o path.o itemdb.o mob.o script.o \ - storage.o skill.o atcommand.o battle.o battleground.o \ - intif.o trade.o party.o vending.o guild.o pet.o \ - log.o mail.o date.o unit.o homunculus.o mercenary.o quest.o instance.o \ - buyingstore.o searchstore.o duel.o pc_groups.o elemental.o cashshop.o channel.o mapreg_sql.o +MAP_OBJ = $(shell ls *.c | sed -e "s/\.c/\.o/g") MAP_SQL_OBJ = $(MAP_OBJ:%=obj_sql/%) MAP_H = $(shell ls ../map/*.h) \ $(shell ls ../config/*.h) @@ -71,26 +66,26 @@ obj_sql: # executables -map-server: obj_sql $(MAP_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a +map-server: obj_sql $(MAP_SQL_OBJ) $(COMMON_SQL_AR) $(COMMON_AR) $(LIBCONFIG_AR) @echo " LD @OMAP@@EXEEXT@" - @@CC@ @LDFLAGS@ -o ../../@OMAP@@EXEEXT@ $(MAP_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @PCRE_LIBS@ @MYSQL_LIBS@ + @@CC@ @LDFLAGS@ -o ../../@OMAP@@EXEEXT@ $(MAP_SQL_OBJ) $(COMMON_SQL_AR) $(COMMON_AR) $(MT19937AR_OBJ) $(LIBCONFIG_AR) @LIBS@ @PCRE_LIBS@ @MYSQL_LIBS@ # map object files obj_sql/%.o: %.c $(MAP_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) @echo " CC $<" - @@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CC@ @CFLAGS@ $(COMMON_INCLUDE) $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing object files -../common/obj_all/common.a: +$(COMMON_AR): @$(MAKE) -C ../common sql -../common/obj_sql/common_sql.a: +$(COMMON_SQL_AR): @$(MAKE) -C ../common sql -MT19937AR_OBJ: +$(MT19937AR_OBJ): @$(MAKE) -C ../../3rdparty/mt19937ar -LIBCONFIG_OBJ: +$(LIBCONFIG_AR): @$(MAKE) -C ../../3rdparty/libconfig diff --git a/src/map/intif.h b/src/map/intif.h index beea249726..c97c961571 100644 --- a/src/map/intif.h +++ b/src/map/intif.h @@ -2,7 +2,7 @@ // For more information, see LICENCE in the main folder #ifndef _INTIF_H_ -#define _INFIF_H_ +#define _INTIF_H_ //#include "../common/mmo.h" struct party_member; diff --git a/src/test/Makefile.in b/src/test/Makefile.in index e3a763789d..66369788d7 100644 --- a/src/test/Makefile.in +++ b/src/test/Makefile.in @@ -5,11 +5,8 @@ MT19937AR_OBJ = ../../3rdparty/mt19937ar/mt19937ar.o MT19937AR_H = ../../3rdparty/mt19937ar/mt19937ar.h MT19937AR_INCLUDE = -I../../3rdparty/mt19937ar -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_H = $(shell ls ../../3rdparty/libconfig/*.h) +LIBCONFIG_AR = ../../3rdparty/libconfig/obj/libconfig.a LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig TEST_SPINLOCK_OBJ=obj/test_spinlock.o @@ -40,7 +37,7 @@ help: test_spinlock: $(TEST_SPINLOCK_DEPENDS) @echo " LD $@" - @@CC@ @LDFLAGS@ -o ../../test_spinlock@EXEEXT@ $(TEST_SPINLOCK_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@ + @@CC@ @LDFLAGS@ -o ../../test_spinlock@EXEEXT@ $(TEST_SPINLOCK_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_AR) @LIBS@ @MYSQL_LIBS@ # object directories @@ -64,5 +61,5 @@ obj/%.o: %.c $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) MT19937AR_OBJ: @$(MAKE) -C ../../3rdparty/mt19937ar -LIBCONFIG_OBJ: +LIBCONFIG_AR: @$(MAKE) -C ../../3rdparty/libconfig diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in index d72ef5405a..dcf49bc937 100644 --- a/src/tool/Makefile.in +++ b/src/tool/Makefile.in @@ -1,16 +1,11 @@ -COMMON_OBJ = ../common/obj_all/minicore.o ../common/obj_all/malloc.o \ - ../common/obj_all/showmsg.o ../common/obj_all/strlib.o \ - ../common/obj_all/utils.o ../common/obj_all/des.o ../common/obj_all/grfio.o -COMMON_H = ../common/core.h ../common/mmo.h \ - ../common/malloc.h ../common/showmsg.h ../common/strlib.h \ - ../common/utils.h ../common/cbasetypes.h ../common/des.h ../common/grfio.h ../config/renewal.h +COMMON_OBJ = minicore.o malloc.o showmsg.o strlib.o utils.o des.o grfio.o +COMMON_DIR_OBJ = $(COMMON_OBJ:%=../common/obj_all/%) +COMMON_H = $(shell ls ../common/*.h) +COMMON_INCLUDE = -I../common/ -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_H = $(shell ls ../../3rdparty/libconfig/*.h) +LIBCONFIG_AR = ../../3rdparty/libconfig/obj/libconfig.a LIBCONFIG_INCLUDE = -I../../3rdparty/libconfig OTHER_H = ../config/renewal.h @@ -24,9 +19,9 @@ MAPCACHE_OBJ = obj_all/mapcache.o all: mapcache -mapcache: obj_all $(MAPCACHE_OBJ) $(COMMON_OBJ) $(LIBCONFIG_OBJ) +mapcache: obj_all $(MAPCACHE_OBJ) $(COMMON_DIR_OBJ) $(LIBCONFIG_OBJ) @echo " LD $@" - @@CC@ @LDFLAGS@ $(LIBCONFIG_INCLUDE) -o ../../mapcache@EXEEXT@ $(MAPCACHE_OBJ) $(COMMON_OBJ) $(LIBCONFIG_OBJ) @LIBS@ + @@CC@ @LDFLAGS@ -o ../../mapcache@EXEEXT@ $(MAPCACHE_OBJ) $(COMMON_DIR_OBJ) $(LIBCONFIG_AR) @LIBS@ clean: @echo " CLEAN tool" @@ -46,14 +41,11 @@ obj_all: obj_all/%.o: %.c $(COMMON_H) $(OTHER_H) $(LIBCONFIG_H) @echo " CC $<" - @@CC@ @CFLAGS@ $(LIBCONFIG_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CC@ @CFLAGS@ $(COMMON_INCLUDE) $(LIBCONFIG_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing common object files -../common/obj_all/%.o: - @$(MAKE) -C ../common txt +$(COMMON_DIR_OBJ): + @$(MAKE) -C ../common sql -../common/obj_all/mini%.o: - @$(MAKE) -C ../common txt - -LIBCONFIG_OBJ: +$(LIBCONFIG_AR): @$(MAKE) -C ../../3rdparty/libconfig