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 /Makefile.in | |
| 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 'Makefile.in')
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 5 insertions, 5 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 $@ |