From 81e4918a779ef631106fd2ecaae6bd6433fb2b07 Mon Sep 17 00:00:00 2001 From: blacksirius Date: Fri, 1 Jun 2012 10:46:02 +0000 Subject: 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 --- 3rdparty/libconfig/Makefile.in | 6 ++++-- 3rdparty/mt19937ar/Makefile.in | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to '3rdparty') diff --git a/3rdparty/libconfig/Makefile.in b/3rdparty/libconfig/Makefile.in index 12ff7572b..ab03d4154 100644 --- a/3rdparty/libconfig/Makefile.in +++ b/3rdparty/libconfig/Makefile.in @@ -10,7 +10,8 @@ LIBCONFIG_H = libconfig.h grammar.h parsectx.h scanctx.h scanner.h strbuf.h winc all: $(LIBCONFIG_OBJ) clean: - rm -rf *.o + @echo " CLEAN libconfig" + @rm -rf *.o help: @echo "possible targets are 'all' 'clean' 'help'" @@ -21,4 +22,5 @@ help: ##################################################################### %.o: %.c $(LIBCONFIG_H) - @CC@ @CFLAGS@ @DEFS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @echo " CC $<" + @@CC@ @CFLAGS@ @DEFS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< diff --git a/3rdparty/mt19937ar/Makefile.in b/3rdparty/mt19937ar/Makefile.in index 7cae3140b..63f75fdad 100644 --- a/3rdparty/mt19937ar/Makefile.in +++ b/3rdparty/mt19937ar/Makefile.in @@ -9,8 +9,9 @@ MT19937AR_H = mt19937ar.h all: $(MT19937AR_OBJ) -clean: - rm -rf *.o +clean: + @echo " CLEAN mt19937ar" + @rm -rf *.o help: @echo "possible targets are 'all' 'clean' 'help'" @@ -21,4 +22,5 @@ help: ##################################################################### %.o: %.c $(MT19937AR_H) - @CC@ @CFLAGS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @echo " CC $<" + @@CC@ @CFLAGS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< -- cgit v1.2.3-60-g2f50