From e49bce26d3de1a5c2afbe018a869ff8790294fc5 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Wed, 16 Mar 2011 00:38:02 -0700
Subject: Use makefiles correctly and expand include dirs

---
 src/ladmin/Makefile  | 3 +--
 src/ladmin/ladmin.c  | 8 ++++----
 src/ladmin/md5calc.c | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/ladmin')

diff --git a/src/ladmin/Makefile b/src/ladmin/Makefile
index 3221901..9199951 100644
--- a/src/ladmin/Makefile
+++ b/src/ladmin/Makefile
@@ -8,9 +8,8 @@ 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/malloc.h ../common/mt_rand.h
 
 ladmin: ladmin.o md5calc.o $(COMMON_OBJ)
-	$(CC) -o ../../$@ ladmin.o md5calc.o $(COMMON_OBJ)
 ladmin.o: ladmin.c ladmin.h md5calc.h $(COMMON_H)
 md5calc.o: md5calc.c md5calc.h
 
 clean:
-	rm -f *.o ../../ladmin
+	rm -f *.o ladmin
diff --git a/src/ladmin/ladmin.c b/src/ladmin/ladmin.c
index 5ef9b6c..d7f4f5f 100644
--- a/src/ladmin/ladmin.c
+++ b/src/ladmin/ladmin.c
@@ -22,11 +22,11 @@
 #include <stdarg.h>             // valist
 #include <ctype.h>              // tolower
 
-#include "core.h"
-#include "socket.h"
+#include "../common/core.h"
+#include "../common/socket.h"
 #include "ladmin.h"
-#include "version.h"
-#include "mmo.h"
+#include "../common/version.h"
+#include "../common/mmo.h"
 
 #ifdef PASSWORDENC
 #include "md5calc.h"
diff --git a/src/ladmin/md5calc.c b/src/ladmin/md5calc.c
index cf9d958..ec1d8ec 100644
--- a/src/ladmin/md5calc.c
+++ b/src/ladmin/md5calc.c
@@ -10,7 +10,7 @@
 #include "md5calc.h"
 #include <string.h>
 #include <stdio.h>
-#include "mt_rand.h"
+#include "../common/mt_rand.h"
 
 #ifndef UINT_MAX
 #define UINT_MAX 4294967295U
-- 
cgit v1.2.3-70-g09d2