summaryrefslogtreecommitdiff
path: root/src/login
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/login
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/login')
-rw-r--r--src/login/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/login/Makefile b/src/login/Makefile
index 0411129..4b65c33 100644
--- a/src/login/Makefile
+++ b/src/login/Makefile
@@ -1,3 +1,5 @@
+include ../../make.defs
+
all: login-server
txt: login-server
@@ -5,7 +7,7 @@ COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/version.h ../common/db.h ../common/lock.h ../common/malloc.h ../common/mt_rand.h
login-server: login.o md5calc.o $(COMMON_OBJ)
- $(CC) -o ../../$@ login.o md5calc.o $(COMMON_OBJ)
+ $(CC) $(CFLAGS) -o ../../$@ login.o md5calc.o $(COMMON_OBJ)
login.o: login.c login.h md5calc.h $(COMMON_H)
md5calc.o: md5calc.c md5calc.h