summaryrefslogtreecommitdiff
path: root/src/tool
diff options
context:
space:
mode:
authorblacksirius <blacksirius@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-01 10:46:02 +0000
committerblacksirius <blacksirius@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-01 10:46:02 +0000
commit81e4918a779ef631106fd2ecaae6bd6433fb2b07 (patch)
treeedea88dcaae69f8d8d859609201883aa3207f0f3 /src/tool
parent3433dea871bcd256e2635e0b416467330633af95 (diff)
downloadhercules-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/tool')
-rw-r--r--src/tool/Makefile.in9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in
index 2ad022936..59ef89958 100644
--- a/src/tool/Makefile.in
+++ b/src/tool/Makefile.in
@@ -23,10 +23,12 @@ MAPCACHE_OBJ = obj_all/mapcache.o
all: mapcache
mapcache: obj_all $(MAPCACHE_OBJ) $(COMMON_OBJ) $(LIBCONFIG_OBJ)
- @CC@ @LDFLAGS@ $(LIBCONFIG_INCLUDE) -o ../../mapcache@EXEEXT@ $(MAPCACHE_OBJ) $(COMMON_OBJ) $(LIBCONFIG_OBJ) @LIBS@
+ @echo " LD $@"
+ @@CC@ @LDFLAGS@ $(LIBCONFIG_INCLUDE) -o ../../mapcache@EXEEXT@ $(MAPCACHE_OBJ) $(COMMON_OBJ) $(LIBCONFIG_OBJ) @LIBS@
clean:
- rm -rf obj_all/*.o ../../mapcache@EXEEXT@
+ @echo " CLEAN tool"
+ @rm -rf obj_all/*.o ../../mapcache@EXEEXT@
help:
@echo "possible targets are 'mapcache' 'all' 'clean' 'help'"
@@ -41,7 +43,8 @@ obj_all:
-mkdir obj_all
obj_all/%.o: %.c $(COMMON_H) $(LIBCONFIG_H)
- @CC@ @CFLAGS@ $(LIBCONFIG_INCLUDE) @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @echo " CC $<"
+ @@CC@ @CFLAGS@ $(LIBCONFIG_INCLUDE) @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing common object files
../common/obj_all/%.o: