From bb83a7c114c17b67e9209fcda27b125192ce6b5a Mon Sep 17 00:00:00 2001 From: codemaster Date: Mon, 20 Dec 2004 20:11:23 +0000 Subject: * Updated makefiles to new strlib locations [Codemaster] * Moved strlib.h and strlib.c into the common directory [Codemaster] * Updated a bit of jA 1081 - it's not completly updated yet!!! [Codemaster] git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@681 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/txt-converter/char/Makefile | 8 ++++---- src/txt-converter/char/char-converter.c | 2 +- src/txt-converter/login/Makefile | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/txt-converter') diff --git a/src/txt-converter/char/Makefile b/src/txt-converter/char/Makefile index 4dd3db689..a4cca87fd 100644 --- a/src/txt-converter/char/Makefile +++ b/src/txt-converter/char/Makefile @@ -1,13 +1,13 @@ all: char-converter sql: char-converter -COMMON_OBJ = ../../common/core.o ../../common/socket.o ../../common/timer.o ../../common/grfio.o ../../common/db.o ../../common/lock.o ../../common/nullpo.o ../../common/malloc.o ../../common/showmsg.o +COMMON_OBJ = ../../common/core.o ../../common/socket.o ../../common/timer.o ../../common/grfio.o ../../common/db.o ../../common/lock.o ../../common/nullpo.o ../../common/malloc.o ../../common/showmsg.o ../../common/strlib.o -char-converter: char-converter.o strlib.o $(COMMON_OBJ) +char-converter: char-converter.o $(COMMON_OBJ) $(CC) -o ../../../$@ $^ $(LIB_S) -char-converter.o: char-converter.c char.h strlib.h -strlib.o: strlib.c strlib.h +char-converter.o: char-converter.c char.h ../../common/strlib.h +strlib.o: strlib.c ../../common/strlib.h clean: rm -f *.o ../../../char-converter diff --git a/src/txt-converter/char/char-converter.c b/src/txt-converter/char/char-converter.c index 8928e240f..7b35fda63 100644 --- a/src/txt-converter/char/char-converter.c +++ b/src/txt-converter/char/char-converter.c @@ -18,7 +18,7 @@ #define STORAGE_MEMINC 16 #include "char.h" -#include "strlib.h" +#include "../../common/strlib.h" #ifdef MEMWATCH #include "memwatch.h" diff --git a/src/txt-converter/login/Makefile b/src/txt-converter/login/Makefile index 125490479..56b97e772 100644 --- a/src/txt-converter/login/Makefile +++ b/src/txt-converter/login/Makefile @@ -1,12 +1,12 @@ all: login-converter sql: login-converter -COMMON_OBJ = ../../common/core.o ../../common/socket.o ../../common/timer.o ../../common/grfio.o ../../common/db.o ../../common/lock.o ../../common/nullpo.o ../../common/malloc.o ../../common/showmsg.o +COMMON_OBJ = ../../common/core.o ../../common/socket.o ../../common/timer.o ../../common/grfio.o ../../common/db.o ../../common/lock.o ../../common/nullpo.o ../../common/malloc.o ../../common/showmsg.o ../../common/strlib.o -COMMON_H = ../../common/core.h ../../common/socket.h ../../common/timer.h ../../common/mmo.h ../../common/version.h ../../common/db.h ../../common/malloc.h +COMMON_H = ../../common/core.h ../../common/socket.h ../../common/timer.h ../../common/mmo.h ../../common/version.h ../../common/db.h ../../common/malloc.h ../../common/strlib.h -login-converter: login-converter.o ../../login_sql/md5calc.o ../../login_sql/strlib.o $(COMMON_OBJ) +login-converter: login-converter.o ../../login_sql/md5calc.o $(COMMON_OBJ) $(CC) -o ../../../$@ $^ $(LIB_S) -login-converter.o: login-converter.c ../../login_sql/login.h ../../login_sql/md5calc.h ../../login_sql/strlib.h $(COMMON_H) +login-converter.o: login-converter.c ../../login_sql/login.h ../../login_sql/md5calc.h $(COMMON_H) clean: rm -f *.o ../../../login-converter -- cgit v1.2.3-60-g2f50