diff options
author | shennetsind <ind@henn.et> | 2013-02-16 17:37:50 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-02-16 17:37:50 -0200 |
commit | 78b4db8a026e9e16367daa12eac03955815ef94c (patch) | |
tree | 813912e643c2ccaa180267a746a5d932cf2ae6a9 /src/map/Makefile.in | |
parent | 484c1b6ac438e58c66f5ff16b09e2cf07c8e1981 (diff) | |
download | hercules-78b4db8a026e9e16367daa12eac03955815ef94c.tar.gz hercules-78b4db8a026e9e16367daa12eac03955815ef94c.tar.bz2 hercules-78b4db8a026e9e16367daa12eac03955815ef94c.tar.xz hercules-78b4db8a026e9e16367daa12eac03955815ef94c.zip |
Dropped _sql suffix in server names.
Updated .gitignore to reflect this change, also renamed some other stuff to make their functionality clearer.
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/Makefile.in')
-rw-r--r-- | src/map/Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/Makefile.in b/src/map/Makefile.in index 8e97221a7..d2c9d63d0 100644 --- a/src/map/Makefile.in +++ b/src/map/Makefile.in @@ -32,7 +32,7 @@ MAP_H = map.h chrif.h clif.h pc.h status.h npc.h \ HAVE_MYSQL=@HAVE_MYSQL@ ifeq ($(HAVE_MYSQL),yes) ALL_DEPENDS=txt sql - SQL_DEPENDS=map-server_sql + SQL_DEPENDS=map-server else ALL_TARGET=txt SQL_DEPENDS=needs_mysql @@ -59,7 +59,7 @@ sql: $(SQL_DEPENDS) clean: @echo " CLEAN map" - @rm -rf *.o obj_txt obj_sql ../../map-server@EXEEXT@ ../../map-server_sql@EXEEXT@ + @rm -rf *.o obj_txt obj_sql ../../map-server@EXEEXT@ ../../map-server@EXEEXT@ help: ifeq ($(HAVE_MYSQL),yes) @@ -90,9 +90,9 @@ obj_sql: # executables -map-server_sql: obj_sql $(MAP_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a +map-server: obj_sql $(MAP_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a @echo " LD $@" - @@CC@ @LDFLAGS@ -o ../../map-server_sql@EXEEXT@ $(MAP_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @PCRE_LIBS@ @MYSQL_LIBS@ + @@CC@ @LDFLAGS@ -o ../../map-server@EXEEXT@ $(MAP_SQL_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @PCRE_LIBS@ @MYSQL_LIBS@ # map object files |