From 75359a9cd5faeda4156b56cfc63e2e553cae1785 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Sun, 14 Jul 2013 17:26:28 +0200
Subject: Makefile error corrections and minor tweaks

- Fixed some variable names incorrectly entered as literals in target
  names
- This fixes a build failure when trying to build any specific
  sub-project directly from src/*/
- Removed an old svn-related command from the 'import' recipe
- This fixes the build failures when trying to run 'make tools' right
  after 'make clean'
- Removed duplicate entries in the 'clean' recipe for map and login
  servers

Signed-off-by: Haru <haru@dotalux.com>
---
 Makefile.in            | 10 +++++-----
 src/char/Makefile.in   |  4 ++--
 src/common/Makefile.in |  4 ++--
 src/login/Makefile.in  |  6 +++---
 src/map/Makefile.in    |  6 +++---
 src/test/Makefile.in   |  4 ++--
 src/tool/Makefile.in   |  2 +-
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 769892f1a..cd8b384b4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,6 +8,7 @@ ifeq ($(HAVE_MYSQL),yes)
 	LOGIN_SQL_DEPENDS=mt19937ar libconfig common_sql
 	CHAR_SQL_DEPENDS=mt19937ar libconfig common_sql
 	MAP_SQL_DEPENDS=mt19937ar libconfig common_sql
+	TOOLS_DEPENDS=mt19937ar libconfig common_sql
 	CONVERTERS_DEPENDS=common_sql
 else
 	ALL_DEPENDS=needs_mysql
@@ -16,6 +17,7 @@ else
 	LOGIN_SQL_DEPENDS=needs_mysql
 	CHAR_SQL_DEPENDS=needs_mysql
 	MAP_SQL_DEPENDS=needs_mysql
+	TOOLS_DEPENDS=needs_mysql
 endif
 
 WITH_PLUGINS=@WITH_PLUGINS@
@@ -62,7 +64,7 @@ char_sql: $(CHAR_SQL_DEPENDS)
 map_sql: $(MAP_SQL_DEPENDS)
 	@$(MAKE) -C src/map sql
 
-tools:
+tools: $(TOOLS_DEPENDS)
 	@$(MAKE) -C src/tool
 
 test:
@@ -72,13 +74,11 @@ plugins: $(PLUGIN_DEPENDS)
 	@$(MAKE) -C src/plugins
 
 import:
-# 1) create conf/import folder
-# 2) add missing files
-# 3) remove remaining .svn folder
+	@# 1) create conf/import folder
+	@# 2) add missing files
 	@echo "building conf/import folder..."
 	@if test ! -d conf/import ; then mkdir conf/import ; fi
 	@for f in $$(ls conf/import-tmpl) ; do if test ! -e conf/import/$$f ; then cp conf/import-tmpl/$$f conf/import ; fi ; done
-	@rm -rf conf/import/.svn
 
 clean:
 	@$(MAKE) -C src/common $@
diff --git a/src/char/Makefile.in b/src/char/Makefile.in
index a320579b5..a34fc0b31 100644
--- a/src/char/Makefile.in
+++ b/src/char/Makefile.in
@@ -69,8 +69,8 @@ obj_sql/%.o: %.c $(CHAR_H) $(COMMON_H) $(COMMON_SQL_H) $(MT19937AR_H) $(LIBCONFI
 ../common/obj_sql/common_sql.a:
 	@$(MAKE) -C ../common sql
 
-MT19937AR_OBJ:
+$(MT19937AR_OBJ):
 	@$(MAKE) -C ../../3rdparty/mt19937ar
 
-LIBCONFIG_OBJ:
+$(LIBCONFIG_OBJ):
 	@$(MAKE) -C ../../3rdparty/libconfig
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 279f82e5f..dce817e67 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -91,8 +91,8 @@ obj_sql/%.o: %.c $(COMMON_H) $(COMMON_SQL_H) $(LIBCONFIG_H)
 
 
 # missing object files
-MT19937AR_OBJ:
+$(MT19937AR_OBJ):
 	@$(MAKE) -C ../../3rdparty/mt19937ar
 
-LIBCONFIG_OBJ:
+$(LIBCONFIG_OBJ):
 	@$(MAKE) -C ../../3rdparty/libconfig
diff --git a/src/login/Makefile.in b/src/login/Makefile.in
index 543b31b93..7f5024ef8 100644
--- a/src/login/Makefile.in
+++ b/src/login/Makefile.in
@@ -35,7 +35,7 @@ sql: obj_sql login-server
 
 clean:
 	@echo "	CLEAN	login"
-	@rm -rf *.o obj_sql ../../login-server@EXEEXT@ ../../login-server@EXEEXT@
+	@rm -rf *.o obj_sql ../../login-server@EXEEXT@
 
 help:
 	@echo "possible targets are 'sql' 'all' 'clean' 'help'"
@@ -76,8 +76,8 @@ obj_sql/%.o: %.c $(LOGIN_H) $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
 ../common/obj_sql/common_sql.a:
 	@$(MAKE) -C ../common sql
 
-MT19937AR_OBJ:
+$(MT19937AR_OBJ):
 	@$(MAKE) -C ../../3rdparty/mt19937ar
 
-LIBCONFIG_OBJ:
+$(LIBCONFIG_OBJ):
 	@$(MAKE) -C ../../3rdparty/libconfig
diff --git a/src/map/Makefile.in b/src/map/Makefile.in
index bb99b6a05..d5e362e48 100644
--- a/src/map/Makefile.in
+++ b/src/map/Makefile.in
@@ -59,7 +59,7 @@ sql: $(SQL_DEPENDS)
 
 clean:
 	@echo "	CLEAN	map"
-	@rm -rf *.o obj_txt obj_sql ../../map-server@EXEEXT@ ../../map-server@EXEEXT@
+	@rm -rf *.o obj_txt obj_sql ../../map-server@EXEEXT@
 
 help:
 ifeq ($(HAVE_MYSQL),yes)
@@ -107,8 +107,8 @@ obj_sql/%.o: %.c $(MAP_H) $(COMMON_H)  $(MT19937AR_H) $(LIBCONFIG_H)
 ../common/obj_sql/common_sql.a:
 	@$(MAKE) -C ../common sql
         
-MT19937AR_OBJ:
+$(MT19937AR_OBJ):
 	@$(MAKE) -C ../../3rdparty/mt19937ar
 
-LIBCONFIG_OBJ:
+$(LIBCONFIG_OBJ):
 	@$(MAKE) -C ../../3rdparty/libconfig
diff --git a/src/test/Makefile.in b/src/test/Makefile.in
index c601de9cb..c45ec3334 100644
--- a/src/test/Makefile.in
+++ b/src/test/Makefile.in
@@ -54,8 +54,8 @@ obj/%.o: %.c $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H)
 ../common/obj_sql/common_sql.a:
 	@$(MAKE) -C ../common sql
 
-MT19937AR_OBJ:
+$(MT19937AR_OBJ):
 	@$(MAKE) -C ../../3rdparty/mt19937ar
 
-LIBCONFIG_OBJ:
+$(LIBCONFIG_OBJ):
 	@$(MAKE) -C ../../3rdparty/libconfig
diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in
index 1e149c2b3..c1780fe51 100644
--- a/src/tool/Makefile.in
+++ b/src/tool/Makefile.in
@@ -56,5 +56,5 @@ obj_all/%.o: %.c $(COMMON_H) $(OTHER_H) $(LIBCONFIG_H)
 ../common/obj_all/mini%.o:
 	@$(MAKE) -C ../common sql
 
-LIBCONFIG_OBJ:
+$(LIBCONFIG_OBJ):
 	@$(MAKE) -C ../../3rdparty/libconfig
-- 
cgit v1.2.3-70-g09d2