summaryrefslogtreecommitdiff
path: root/src/txt-converter/char
diff options
context:
space:
mode:
authorMadCamel <madcamel@gmail.com>2010-05-05 07:34:05 -0400
committerMadCamel <madcamel@gmail.com>2010-05-05 07:34:05 -0400
commit51e87379c9d532cafc98b96178709b8b8c88e1ae (patch)
treedb80f2e1a758b2739ab79218a88a3def501f362d /src/txt-converter/char
parentae73f3122063048b3a5a2d1c48f6c13b02fd4e1f (diff)
downloadtmwa-51e87379c9d532cafc98b96178709b8b8c88e1ae.tar.gz
tmwa-51e87379c9d532cafc98b96178709b8b8c88e1ae.tar.bz2
tmwa-51e87379c9d532cafc98b96178709b8b8c88e1ae.tar.xz
tmwa-51e87379c9d532cafc98b96178709b8b8c88e1ae.zip
Fixed up and slightly simplified the build system
It's now possible to run 'make' in any of the src/ subdirs and have it build properly. Moved some tools including eathena-monitor to src/tools - run 'make tools' to build. CFLAGS, etc are now in the 'make.defs' file. Requires GNU make.
Diffstat (limited to 'src/txt-converter/char')
-rw-r--r--src/txt-converter/char/GNUmakefile13
-rw-r--r--src/txt-converter/char/Makefile2
2 files changed, 2 insertions, 13 deletions
diff --git a/src/txt-converter/char/GNUmakefile b/src/txt-converter/char/GNUmakefile
deleted file mode 100644
index 56723ca..0000000
--- a/src/txt-converter/char/GNUmakefile
+++ /dev/null
@@ -1,13 +0,0 @@
-all: char-converter
-sql: char-converter
-
-COMMON_OBJ = ../../common/core.o ../../common/socket.o ../../common/timer.o ../../common/db.o ../../common/malloc.o
-
-char-converter: char-converter.o strlib.o $(COMMON_OBJ)
- $(CC) -o ../../../$@ $^ $(LIB_S)
-
-char-converter.o: char-converter.c char.h strlib.h
-strlib.o: strlib.c strlib.h
-clean:
- rm -f *.o ../../../char-converter
-
diff --git a/src/txt-converter/char/Makefile b/src/txt-converter/char/Makefile
index 56723ca..47d97d3 100644
--- a/src/txt-converter/char/Makefile
+++ b/src/txt-converter/char/Makefile
@@ -1,3 +1,5 @@
+include ../../../make.defs
+
all: char-converter
sql: char-converter