diff options
| author | Haru <haru@dotalux.com> | 2013-07-14 17:26:28 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2013-07-14 17:26:28 +0200 |
| commit | 75359a9cd5faeda4156b56cfc63e2e553cae1785 (patch) | |
| tree | a438f971219ab0116a740371382fb3d2281dc26b /src | |
| parent | 3462ce6bf3efcc25eb3d4d449a45b89b64a3e70f (diff) | |
| download | hercules-75359a9cd5faeda4156b56cfc63e2e553cae1785.tar.gz hercules-75359a9cd5faeda4156b56cfc63e2e553cae1785.tar.bz2 hercules-75359a9cd5faeda4156b56cfc63e2e553cae1785.tar.xz hercules-75359a9cd5faeda4156b56cfc63e2e553cae1785.zip | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/char/Makefile.in | 4 | ||||
| -rw-r--r-- | src/common/Makefile.in | 4 | ||||
| -rw-r--r-- | src/login/Makefile.in | 6 | ||||
| -rw-r--r-- | src/map/Makefile.in | 6 | ||||
| -rw-r--r-- | src/test/Makefile.in | 4 | ||||
| -rw-r--r-- | src/tool/Makefile.in | 2 |
6 files changed, 13 insertions, 13 deletions
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 |