diff options
| author | blacksirius <blacksirius@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-01 10:46:02 +0000 |
|---|---|---|
| committer | blacksirius <blacksirius@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-01 10:46:02 +0000 |
| commit | 81e4918a779ef631106fd2ecaae6bd6433fb2b07 (patch) | |
| tree | edea88dcaae69f8d8d859609201883aa3207f0f3 /src/char | |
| parent | 3433dea871bcd256e2635e0b416467330633af95 (diff) | |
| download | hercules-81e4918a779ef631106fd2ecaae6bd6433fb2b07.tar.gz hercules-81e4918a779ef631106fd2ecaae6bd6433fb2b07.tar.bz2 hercules-81e4918a779ef631106fd2ecaae6bd6433fb2b07.tar.xz hercules-81e4918a779ef631106fd2ecaae6bd6433fb2b07.zip | |
feature merge bs-coreoptimize->trunk: Build Output Cleanup, Makefile Common Dependency Handling
- "Optimized" the build Output using Makefiles - to Kernel style build output.
- Changed dependency handling to common (core), by generating one lib file (ar) and link against that
instead of assigning all deps individually in every subproject
- Changed header dependency handling in Subproject makefiles - requiring all common/ headers.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16198 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char')
| -rw-r--r-- | src/char/Makefile.in | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/src/char/Makefile.in b/src/char/Makefile.in index 1c93cfa6d..bfe9d1585 100644 --- a/src/char/Makefile.in +++ b/src/char/Makefile.in @@ -1,14 +1,5 @@ -COMMON_OBJ = ../common/obj_all/core.o ../common/obj_all/socket.o ../common/obj_all/timer.o \ - ../common/obj_all/db.o ../common/obj_all/plugins.o ../common/obj_all/lock.o \ - ../common/obj_all/malloc.o ../common/obj_all/showmsg.o ../common/obj_all/utils.o \ - ../common/obj_all/strlib.o \ - ../common/obj_all/mapindex.o ../common/obj_all/ers.o ../common/obj_all/random.o ../common/obj_all/conf.o -COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \ - ../common/db.h ../common/plugins.h ../common/lock.h \ - ../common/malloc.h ../common/showmsg.h ../common/utils.h \ - ../common/strlib.h \ - ../common/mapindex.h ../common/ers.h ../common/random.h ../common/obj_all/conf.h +COMMON_H = $(shell ls ../common/*.h) MT19937AR_OBJ = ../../3rdparty/mt19937ar/mt19937ar.o MT19937AR_H = ../../3rdparty/mt19937ar/mt19937ar.h @@ -30,7 +21,7 @@ CHAR_H = char.h inter.h int_party.h int_guild.h int_storage.h int_pet.h int_homu HAVE_MYSQL=@HAVE_MYSQL@ ifeq ($(HAVE_MYSQL),yes) - CHAR_SERVER_SQL_DEPENDS=obj_sql $(CHAR_OBJ) $(COMMON_OBJ) $(COMMON_SQL_OBJ) $(MT19937AR_OBJ) + CHAR_SERVER_SQL_DEPENDS=obj_sql $(CHAR_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) else CHAR_SERVER_SQL_DEPENDS=needs_mysql endif @@ -43,10 +34,12 @@ endif all: char-server_sql char-server_sql: $(CHAR_SERVER_SQL_DEPENDS) - @CC@ @LDFLAGS@ -o ../../char-server_sql@EXEEXT@ $(CHAR_OBJ) $(COMMON_OBJ) $(COMMON_SQL_OBJ) $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@ + @echo " LD $@" + @@CC@ @LDFLAGS@ -o ../../char-server_sql@EXEEXT@ $(CHAR_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@ clean: - rm -rf *.o obj_sql ../../char-server_sql@EXEEXT@ + @echo " CLEAN char" + @rm -rf *.o obj_sql ../../char-server_sql@EXEEXT@ help: @echo "possible targets are 'char-server_sql' 'all' 'clean' 'help'" @@ -62,16 +55,18 @@ needs_mysql: @exit 1 obj_sql: - -mkdir obj_sql + @echo " MKDIR obj_sql" + @-mkdir obj_sql obj_sql/%.o: %.c $(CHAR_H) $(COMMON_H) $(COMMON_SQL_H) $(MT19937AR_H) $(LIBCONFIG_H) - @CC@ @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @echo " CC $<" + @@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing object files -../common/obj_all/%.o: +../common/obj_all/common.a: @$(MAKE) -C ../common sql -../common/obj_sql/%.o: +../common/obj_sql/common_sql.a: @$(MAKE) -C ../common sql MT19937AR_OBJ: |