From 44d7606656a650dc43018b5c63bb56ad1f70e77c Mon Sep 17 00:00:00 2001
From: gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 20 Jan 2012 20:33:32 +0000
Subject: Merged TXT removal branch back to trunk. * TXT save engine is removed
 and no longer supported. * See also tid:53926, tid:57717.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15503 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Makefile.in | 73 +++++++++++++------------------------------------------------
 1 file changed, 15 insertions(+), 58 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index ea3106317..02ca9b987 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,76 +2,56 @@
 
 HAVE_MYSQL=@HAVE_MYSQL@
 ifeq ($(HAVE_MYSQL),yes)
-	ALL_DEPENDS=mt19937ar common common_sql login login_sql char char_sql map map_sql tools converters import save
-	SQL_DEPENDS=mt19937ar common_sql login_sql char_sql map_sql import save
+	ALL_DEPENDS=common_sql login_sql char_sql map_sql tools import
+	SQL_DEPENDS=common_sql login_sql char_sql map_sql import
 	COMMON_SQL_DEPENDS=mt19937ar
 	LOGIN_SQL_DEPENDS=mt19937ar common_sql
 	CHAR_SQL_DEPENDS=mt19937ar common_sql
 	MAP_SQL_DEPENDS=mt19937ar common_sql
 	CONVERTERS_DEPENDS=common_sql
 else
-	ALL_DEPENDS=mt19937ar common login char map tools import save
+	ALL_DEPENDS=needs_mysql
 	SQL_DEPENDS=needs_mysql
 	COMMON_SQL_DEPENDS=needs_mysql
 	LOGIN_SQL_DEPENDS=needs_mysql
 	CHAR_SQL_DEPENDS=needs_mysql
 	MAP_SQL_DEPENDS=needs_mysql
-	CONVERTERS_DEPENDS=needs_mysql
 endif
-COMMON_TXT_DEPENDS=mt19937ar
-LOGIN_TXT_DEPENDS=mt19937ar common
-CHAR_TXT_DEPENDS=mt19937ar common
-MAP_TXT_DEPENDS=mt19937ar common
 
 WITH_PLUGINS=@WITH_PLUGINS@
 ifeq ($(WITH_PLUGINS),yes)
 	ALL_DEPENDS+=plugins
-	PLUGIN_DEPENDS=common
+	PLUGIN_DEPENDS=common_sql
 else
 	PLUGIN_DEPENDS=no_plugins
 endif
 
 #####################################################################
-.PHONY: txt sql conf \
-	common common_sql \
+.PHONY: sql  \
+	common_sql \
 	mt19937ar \
-	login login_sql \
-	char char_sql \
-	map map_sql \
-	tools converters plugins addons import save \
+	login_sql \
+	char_sql \
+	map_sql \
+	tools plugins addons \
+	import \
 	clean help
 
 all: $(ALL_DEPENDS)
 
-txt: common login char map import save
-
 sql: $(SQL_DEPENDS)
 
-conf: import save
-
-common: $(COMMON_TXT_DEPENDS)
-	@$(MAKE) -C src/common txt
-
 common_sql: $(COMMON_SQL_DEPENDS)
 	@$(MAKE) -C src/common sql
 
 mt19937ar:
 	@$(MAKE) -C 3rdparty/mt19937ar
 
-login: $(LOGIN_TXT_DEPENDS)
-	@$(MAKE) -C src/login txt
-
 login_sql: $(LOGIN_SQL_DEPENDS)
 	@$(MAKE) -C src/login sql
 
-char: $(CHAR_TXT_DEPENDS)
-	@$(MAKE) -C src/char
-
 char_sql: $(CHAR_SQL_DEPENDS)
-	@$(MAKE) -C src/char_sql
-
-map: $(MAP_TXT_DEPENDS)
-	@$(MAKE) -C src/map txt
+	@$(MAKE) -C src/char
 
 map_sql: $(MAP_SQL_DEPENDS)
 	@$(MAKE) -C src/map sql
@@ -79,12 +59,9 @@ map_sql: $(MAP_SQL_DEPENDS)
 tools:
 	@$(MAKE) -C src/tool
 
-converters: $(CONVERTERS_DEPENDS)
-	@$(MAKE) -C src/txt-converter
-
 plugins addons: $(PLUGIN_DEPENDS)
 	@$(MAKE) -C src/plugins
-
+	
 import:
 # 1) create conf/import folder
 # 2) add missing files
@@ -94,50 +71,30 @@ import:
 	@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
 
-save:
-# 1) create save folder
-# 2) add missing files
-# 3) remove remaining .svn folder
-	@echo "building save folder..."
-	@if test ! -d save ; then mkdir save ; fi
-	@for f in $$(ls save-tmpl) ; do if test ! -e save/$$f ; then cp save-tmpl/$$f save ; fi ; done
-	@rm -rf save/.svn
-
 clean:
 	@$(MAKE) -C src/common $@
 	@$(MAKE) -C 3rdparty/mt19937ar $@
 	@$(MAKE) -C src/login $@
 	@$(MAKE) -C src/char $@
-	@$(MAKE) -C src/char_sql $@
 	@$(MAKE) -C src/map $@
 	@$(MAKE) -C src/plugins $@
 	@$(MAKE) -C src/tool $@
-	@$(MAKE) -C src/txt-converter $@
 
 help:
-	@echo "most common targets are 'all' 'txt' 'sql' 'conf' 'clean' 'help'"
+	@echo "most common targets are 'all' '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"
 	@echo "'mt19937ar'   - builds object file of Mersenne Twister MT19937"
-	@echo "'login'       - builds login server (TXT version)"
 	@echo "'login_sql'   - builds login server (SQL version)"
-	@echo "'char'        - builds char server (TXT version)"
 	@echo "'char_sql'    - builds char server (SQL version)"
-	@echo "'map'         - builds map server (TXT version)"
 	@echo "'map_sql'     - builds map server (SQL version)"
 	@echo "'tools'       - builds all the tools in src/tools"
-	@echo "'converters'  - builds the login/char converters"
 	@echo "'plugins'     - builds all the plugins in src/plugins"
 	@echo "'addons'"
 	@echo "'import'      - builds conf/import folder from the template conf/import-tmpl"
-	@echo "'save'        - builds save folder from the template save-tmpl"
 	@echo "'all'         - builds all the above targets"
-	@echo "'txt'         - builds txt servers (targets 'common' 'login' 'char' 'map'"
-	@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 "                'map_sql' and 'import')"
 	@echo "'clean'       - cleans builds and objects"
 	@echo "'help'        - outputs this message"
 
-- 
cgit v1.2.3-60-g2f50