From 81e4918a779ef631106fd2ecaae6bd6433fb2b07 Mon Sep 17 00:00:00 2001
From: blacksirius <blacksirius@54d463be-8e91-2dee-dedb-b68131a5f0ec>
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
---
 src/map/Makefile.in | 43 +++++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

(limited to 'src/map')

diff --git a/src/map/Makefile.in b/src/map/Makefile.in
index beeab32dd..06925bcec 100644
--- a/src/map/Makefile.in
+++ b/src/map/Makefile.in
@@ -1,19 +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/nullpo.o ../common/obj_all/malloc.o ../common/obj_all/showmsg.o \
-	../common/obj_all/utils.o ../common/obj_all/strlib.o ../common/obj_all/grfio.o \
-	../common/obj_all/mapindex.o ../common/obj_all/ers.o ../common/obj_all/md5calc.o \
-	../common/obj_all/random.o ../common/obj_all/des.o ../common/obj_all/conf.o
-COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h \
-	../common/db.h ../common/plugins.h ../common/lock.h \
-	../common/nullpo.h ../common/malloc.h ../common/showmsg.h \
-	../common/utils.h ../common/strlib.h ../common/grfio.h \
-	../common/mapindex.h ../common/ers.h ../common/md5calc.h \
-	../common/random.h ../common/des.h ../common/conf.h
-
-COMMON_SQL_OBJ = ../common/obj_sql/sql.o
-COMMON_SQL_H = ../common/sql.h
+COMMON_H = $(shell ls ../common/*.h)
 
 MT19937AR_OBJ = ../../3rdparty/mt19937ar/mt19937ar.o
 MT19937AR_H = ../../3rdparty/mt19937ar/mt19937ar.h
@@ -72,7 +58,8 @@ txt: $(TXT_DEPENDS)
 sql: $(SQL_DEPENDS)
 
 clean:
-	rm -rf *.o obj_txt obj_sql ../../map-server@EXEEXT@ ../../map-server_sql@EXEEXT@
+	@echo "	CLEAN	map"
+	@rm -rf *.o obj_txt obj_sql ../../map-server@EXEEXT@ ../../map-server_sql@EXEEXT@
 
 help:
 ifeq ($(HAVE_MYSQL),yes)
@@ -94,28 +81,32 @@ needs_mysql:
 
 # object directories
 obj_txt:
-	-mkdir obj_txt
+	@echo "	MKDIR	obj_txt"
+	@-mkdir obj_txt
 
 obj_sql:
-	-mkdir obj_sql
+	@echo "	MKDIR	obj_sql"
+	@-mkdir obj_sql
 
 # executables
 
-map-server_sql: obj_sql $(MAP_SQL_OBJ) $(COMMON_OBJ) $(COMMON_SQL_OBJ)
-	@CC@ @LDFLAGS@ -o ../../map-server_sql@EXEEXT@ $(MAP_SQL_OBJ) $(COMMON_OBJ) $(COMMON_SQL_OBJ) $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @PCRE_LIBS@ @MYSQL_LIBS@
+map-server_sql: obj_sql $(MAP_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a
+	@echo "	LD	$@"
+	@@CC@ @LDFLAGS@ -o ../../map-server_sql@EXEEXT@ $(MAP_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @PCRE_LIBS@ @MYSQL_LIBS@
 
 # map object files
 
-obj_sql/%.o: %.c $(MAP_H) $(COMMON_H) $(COMMON_SQL_H) $(MT19937AR_H) $(LIBCONFIG_H)
-	@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) $(PCRE_CFLAGS) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+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) $<
 
 # 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:
 	@$(MAKE) -C ../../3rdparty/mt19937ar
 
-- 
cgit v1.2.3-70-g09d2