summaryrefslogtreecommitdiff
path: root/src/login
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2011-03-16 00:38:02 -0700
committerBen Longbons <b.r.longbons@gmail.com>2011-03-16 09:02:18 -0700
commite49bce26d3de1a5c2afbe018a869ff8790294fc5 (patch)
treeb01ec81aa67181812303afd4e51bc759bba2a384 /src/login
parent3f0ce47e23fa226b30a4322660b8aab3e74d5240 (diff)
downloadtmwa-e49bce26d3de1a5c2afbe018a869ff8790294fc5.tar.gz
tmwa-e49bce26d3de1a5c2afbe018a869ff8790294fc5.tar.bz2
tmwa-e49bce26d3de1a5c2afbe018a869ff8790294fc5.tar.xz
tmwa-e49bce26d3de1a5c2afbe018a869ff8790294fc5.zip
Use makefiles correctly and expand include dirs
Diffstat (limited to 'src/login')
-rw-r--r--src/login/Makefile9
-rw-r--r--src/login/login.c18
2 files changed, 13 insertions, 14 deletions
diff --git a/src/login/Makefile b/src/login/Makefile
index 32e14d7..185cffb 100644
--- a/src/login/Makefile
+++ b/src/login/Makefile
@@ -1,14 +1,13 @@
include ../../make.defs
-all: login-server
-txt: login-server
+all: txt
+txt: login
COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/lock.o ../common/malloc.o ../common/mt_rand.o ../common/md5calc.o
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 ../common/md5calc.h
-login-server: login.o $(COMMON_OBJ)
- $(CC) $(CFLAGS) -o ../../$@ login.o $(COMMON_OBJ)
+login: $(COMMON_OBJ)
login.o: login.c login.h $(COMMON_H)
clean:
- rm -f *.o ../../login-server
+ rm -f *.o login
diff --git a/src/login/login.c b/src/login/login.c
index 1db85ad..480533e 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -18,17 +18,17 @@
#include <netdb.h>
#include <sys/wait.h>
-#include "core.h"
-#include "socket.h"
-#include "timer.h"
+#include "../common/core.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
#include "login.h"
-#include "mmo.h"
-#include "version.h"
-#include "db.h"
-#include "lock.h"
-#include "mt_rand.h"
+#include "../common/mmo.h"
+#include "../common/version.h"
+#include "../common/db.h"
+#include "../common/lock.h"
+#include "../common/mt_rand.h"
-#include "md5calc.h"
+#include "../common/md5calc.h"
#ifdef MEMWATCH
#include "memwatch.h"