diff options
| -rw-r--r-- | Makefile.in | 11 | ||||
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/tool/Makefile.in | 88 |
4 files changed, 5 insertions, 101 deletions
diff --git a/Makefile.in b/Makefile.in index 3de5e0bf3..e85c1bb96 100644 --- a/Makefile.in +++ b/Makefile.in @@ -23,7 +23,7 @@ HAVE_MYSQL=@HAVE_MYSQL@ ifeq ($(HAVE_MYSQL),yes) - ALL_DEPENDS=common_sql login_sql char_sql map_sql tools sysinfo | import + ALL_DEPENDS=common_sql login_sql char_sql map_sql sysinfo | import SQL_DEPENDS=common_sql login_sql char_sql map_sql sysinfo | import COMMON_SQL_DEPENDS=mt19937ar libconfig sysinfo LOGIN_SQL_DEPENDS=mt19937ar libconfig common_sql sysinfo @@ -53,7 +53,7 @@ HAVE_DOXYGEN=@HAVE_DOXYGEN@ MF_TARGETS = Makefile $(addsuffix /Makefile, src/common 3rdparty/mt19937ar \ 3rdparty/libconfig src/char src/login src/map src/plugins \ - src/tool src/test tools/HPMHookGen tools/doxygen) + src/test tools/HPMHookGen tools/doxygen) CC = @CC@ export CC @@ -65,7 +65,6 @@ export CC login_sql \ char_sql \ map_sql \ - tools \ plugins \ import \ test \ @@ -120,10 +119,6 @@ map_sql: $(MAP_SQL_DEPENDS) src/map/Makefile @echo " MAKE $@" @$(MAKE) -C src/map sql -tools: $(TOOLS_DEPENDS) src/tool/Makefile - @echo " MAKE $@" - @$(MAKE) -C src/tool - test: src/test/Makefile @echo " MAKE $@" @$(MAKE) -C src/test @@ -159,7 +154,6 @@ clean buildclean: $(MF_TARGETS) @$(MAKE) -C src/char $@ @$(MAKE) -C src/map $@ @$(MAKE) -C src/plugins $@ - @$(MAKE) -C src/tool $@ @$(MAKE) -C src/test $@ @$(MAKE) -C tools/HPMHookGen $@ @$(MAKE) -C tools/doxygen $@ @@ -188,7 +182,6 @@ help: Makefile @echo "'login_sql' - builds login server" @echo "'char_sql' - builds char server" @echo "'map_sql' - builds map server" - @echo "'tools' - builds all the tools in src/tools" @echo "'import' - builds conf/import folder from the template conf/import-tmpl" @echo "'all' - builds all the above targets" @echo "'sql' - builds sql servers (targets 'common_sql' 'login_sql' 'char_sql'" @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac 150dff284. +# From configure.ac 26efcebad. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69. # @@ -2199,7 +2199,7 @@ ac_config_files="$ac_config_files 3rdparty/mt19937ar/Makefile 3rdparty/libconfig ac_config_files="$ac_config_files src/char/Makefile src/login/Makefile" -ac_config_files="$ac_config_files src/map/Makefile src/plugins/Makefile src/tool/Makefile" +ac_config_files="$ac_config_files src/map/Makefile src/plugins/Makefile" ac_config_files="$ac_config_files src/test/Makefile" @@ -10486,7 +10486,6 @@ do "src/login/Makefile") CONFIG_FILES="$CONFIG_FILES src/login/Makefile" ;; "src/map/Makefile") CONFIG_FILES="$CONFIG_FILES src/map/Makefile" ;; "src/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/Makefile" ;; - "src/tool/Makefile") CONFIG_FILES="$CONFIG_FILES src/tool/Makefile" ;; "src/test/Makefile") CONFIG_FILES="$CONFIG_FILES src/test/Makefile" ;; "tools/HPMHookGen/Makefile") CONFIG_FILES="$CONFIG_FILES tools/HPMHookGen/Makefile" ;; "tools/doxygen/Makefile") CONFIG_FILES="$CONFIG_FILES tools/doxygen/Makefile" ;; diff --git a/configure.ac b/configure.ac index 2aad9d7e7..9e88b618b 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ AC_CONFIG_SRCDIR([src/common/cbasetypes.h]) AC_CONFIG_FILES([Makefile src/common/Makefile]) AC_CONFIG_FILES([3rdparty/mt19937ar/Makefile 3rdparty/libconfig/Makefile]) AC_CONFIG_FILES([src/char/Makefile src/login/Makefile]) -AC_CONFIG_FILES([src/map/Makefile src/plugins/Makefile src/tool/Makefile]) +AC_CONFIG_FILES([src/map/Makefile src/plugins/Makefile]) AC_CONFIG_FILES([src/test/Makefile]) AC_CONFIG_FILES([tools/HPMHookGen/Makefile]) AC_CONFIG_FILES([tools/doxygen/Makefile]) diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in deleted file mode 100644 index d4c178218..000000000 --- a/src/tool/Makefile.in +++ /dev/null @@ -1,88 +0,0 @@ -# This file is part of Hercules. -# http://herc.ws - http://github.com/HerculesWS/Hercules -# -# Copyright (C) 2012-2018 Hercules Dev Team -# Copyright (C) Athena Dev Teams -# -# Hercules is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# @configure_input@ - -CONFIG_D = ../config -CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h) - -COMMON_D = ../common -COMMON_H = $(filter-out %.p.h, $(wildcard $(COMMON_D)/*.h)) -SYSINFO_INC = $(COMMON_D)/sysinfo.inc -COMMON_INCLUDE = -I.. - -THIRDPARTY_D = ../../3rdparty -THIRDPARTY_INCLUDE = -I$(THIRDPARTY_D) - -LIBCONFIG_D = $(THIRDPARTY_D)/libconfig -LIBCONFIG_OBJ = $(addprefix $(LIBCONFIG_D)/, libconfig.o grammar.o scanctx.o \ - scanner.o strbuf.o) -LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \ - scanctx.h scanner.h strbuf.h wincompat.h) - -@SET_MAKE@ - -CC = @CC@ -export CC - -##################################################################### -.PHONY: all clean buildclean help - -all: Makefile - -buildclean: - @echo " CLEAN tool (build temp files)" - @rm -rf obj_all/*.o - -clean: buildclean - @echo " CLEAN tool" - -help: - @echo "possible targets are 'all' 'clean' 'help'" - @echo "'all' - builds all above targets" - @echo "'clean' - cleans builds and objects" - @echo "'buildclean' - cleans build temporary (object) files, without deleting the" - @echo " executables" - @echo "'help' - outputs this message" - -##################################################################### - -Makefile: Makefile.in - @$(MAKE) -C ../.. src/tool/Makefile - -$(SYSINFO_INC): $(COMMON_H) $(CONFIG_H) $(LIBCONFIG_H) - @echo " MAKE $@" - @$(MAKE) -C ../.. sysinfo - -obj_all: - @echo " MKDIR obj_all" - @-mkdir obj_all - -obj_all/%.o: %.c $(COMMON_H) $(CONFIG_H) $(LIBCONFIG_H) | obj_all - @echo " CC $<" - @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $< - -# missing common object files -$(COMMON_D)/obj_all/common_mini.a: - @echo " MAKE $@" - @$(MAKE) -C $(COMMON_D) common_mini - -$(LIBCONFIG_OBJ): - @echo " MAKE $@" - @$(MAKE) -C $(LIBCONFIG_D) |