From e49bce26d3de1a5c2afbe018a869ff8790294fc5 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Wed, 16 Mar 2011 00:38:02 -0700
Subject: Use makefiles correctly and expand include dirs

---
 Makefile | 41 ++++++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a6b9350..bc90aa8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,35 @@
-# $Id$
 include make.defs
 
-all clean: src/common/Makefile src/login/Makefile src/char/Makefile src/map/Makefile src/ladmin/Makefile
-	cd src ; cd common ; $(MAKE) $(MKDEF) $@ ; cd ..
-	cd src ; cd login ; $(MAKE) $(MKDEF) $@ ; cd ..
-	cd src ; cd char ; $(MAKE) $(MKDEF) $@ ; cd ..
-	cd src ; cd map ; $(MAKE) $(MKDEF) $@ ; cd ..
-	cd src ; cd ladmin ; $(MAKE) $(MKDEF) $@ ; cd ..
+all: login-server char-server map-server ladmin
+common:
+	${MAKE} -C src/common
+login-server: common
+	${MAKE} -C src/login
+	${CP} src/login/login login-server
+char-server: common
+	${MAKE} -C src/char
+	${CP} src/char/char char-server
+map-server: common
+	${MAKE} -C src/map
+	${CP} src/map/map map-server
+ladmin: common
+	${MAKE} -C src/ladmin
 
-tools:
-	cd src/tool && $(MAKE) $(MKDEF) && cd ..
+clean: clean-common clean-login clean-char clean-map clean-ladmin clean-tools
+
+clean-common:
+	${MAKE} -C src/common clean
+clean-login:
+	${MAKE} -C src/login clean
+clean-char:
+	${MAKE} -C src/char clean
+clean-map:
+	${MAKE} -C src/map clean
+clean-ladmin:
+	${MAKE} -C src/ladmin clean
+
+# This target is separate for historical reasons, and because it is optional
+tools: common
+	${MAKE} -C src/tool
+clean-tools:
+	${MAKE} -C src/tool clean
-- 
cgit v1.2.3-70-g09d2


From 9f36288ddb356608da0348814100873729c16a9d Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Wed, 16 Mar 2011 13:40:58 -0700
Subject: Fix makefile so tools depend on common, and copy eathena-monitor to
 root directory

---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index bc90aa8..50226fd 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,9 @@ clean-ladmin:
 	${MAKE} -C src/ladmin clean
 
 # This target is separate for historical reasons, and because it is optional
-tools: common
+tools: common eathena-monitor
+eathena-monitor:
 	${MAKE} -C src/tool
+	${CP} src/tool/eathena-monitor .
 clean-tools:
 	${MAKE} -C src/tool clean
-- 
cgit v1.2.3-70-g09d2


From 81362204ace57c1af844bf784f5599cc91190f8b Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Wed, 16 Mar 2011 18:44:36 -0700
Subject: Fix top-level makefile to rebuild when sources change

---
 Makefile | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 50226fd..c34b691 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,21 @@
 include make.defs
 
 all: login-server char-server map-server ladmin
-common:
+tools: tool eathena-monitor
+
+
+common: src/common
 	${MAKE} -C src/common
-login-server: common
+login-server: common src/login
 	${MAKE} -C src/login
 	${CP} src/login/login login-server
-char-server: common
+char-server: common src/char
 	${MAKE} -C src/char
 	${CP} src/char/char char-server
-map-server: common
+map-server: common src/map
 	${MAKE} -C src/map
 	${CP} src/map/map map-server
-ladmin: common
+ladmin: common src/ladmin
 	${MAKE} -C src/ladmin
 
 clean: clean-common clean-login clean-char clean-map clean-ladmin clean-tools
@@ -29,9 +32,9 @@ clean-ladmin:
 	${MAKE} -C src/ladmin clean
 
 # This target is separate for historical reasons, and because it is optional
-tools: common eathena-monitor
-eathena-monitor:
+tool: common src/tool
 	${MAKE} -C src/tool
+eathena-monitor: tool
 	${CP} src/tool/eathena-monitor .
 clean-tools:
 	${MAKE} -C src/tool clean
-- 
cgit v1.2.3-70-g09d2