diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | Makefile.in | 14 |
2 files changed, 12 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 7f4b7cf75..c83f80420 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2007/11/21 + * Added backward compatible target 'conf' to the Makefile. [FlavioJS] * Changed Lif's Emergency Avoid to just get a normal skill delay (blocks all skills, cancelled by mapchange / re-summon) instead of getting a persistent block on only this one skill (bugreport:13) diff --git a/Makefile.in b/Makefile.in index a2b1cd150..2c1b0a95e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20,8 +20,13 @@ else endif ##################################################################### -.PHONY: txt sql common common_sql login login_sql char char_sql map map_sql \ - ladmin tools converters plugins addons import save clean help depend +.PHONY: txt sql conf \ + common common_sql \ + login login_sql \ + char char_sql \ + map map_sql \ + ladmin tools converters plugins addons import save \ + clean help all: $(ALL_DEPENDS) @@ -29,6 +34,8 @@ txt: common login char map import save sql: $(SQL_DEPENDS) +conf: import save + common: @$(MAKE) -C src/common txt @@ -96,7 +103,7 @@ clean: @$(MAKE) -C src/txt-converter $@ help: - @echo "most common targets are 'all' 'txt' 'sql' 'clean' 'help'" + @echo "most common targets are 'all' 'txt' 'sql' 'conf' 'clean' 'help'" @echo "possible targets are:" @echo "'common' - builds object files used in TXT servers" @echo "'common_sql' - builds object files used in SQL servers" @@ -118,6 +125,7 @@ help: @echo " 'import' and 'save')" @echo "'sql' - builds sql servers (targets 'common_sql' 'login_sql' 'char_sql'" @echo " 'map_sql' 'import' and 'save')" + @echo "'conf' - builds templated folders/files (targets 'import' and 'save')" @echo "'clean' - cleans builds and objects" @echo "'help' - outputs this message" |