Use makefiles correctly and expand include dirs

5 files changed, 23 insertions, 24 deletions

diff --git a/src/char/Makefile b/src/char/Makefile
index 5eb4b51..6f2e4af 100644
--- a/src/char/Makefile
+++ b/src/char/Makefile
@@ -1,12 +1,11 @@
 include ../../make.defs
 
-all: char-server
-txt: char-server
+all: txt
+txt: char
 
 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_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/db.h ../common/lock.h ../common/timer.h ../common/malloc.h ../common/mt_rand.h
-char-server: char.o inter.o int_party.o int_guild.o int_storage.o $(COMMON_OBJ)
-	$(CC) $(CFLAGS) -o ../../$@ $^
+char: char.o inter.o int_party.o int_guild.o int_storage.o $(COMMON_OBJ)
 
 char.o: char.c char.h inter.h $(COMMON_H) ../common/version.h
 inter.o: inter.c inter.h int_party.h int_guild.h int_storage.h char.h $(COMMON_H)
@@ -15,4 +14,4 @@ int_guild.o: int_guild.c int_guild.h int_storage.h inter.h char.h $(COMMON_H)
 int_storage.o: int_storage.c int_storage.h int_guild.h inter.h char.h $(COMMON_H)
 
 clean:
-	rm -f *.o ../../char-server
+	rm -f *.o char
diff --git a/src/char/char.c b/src/char/char.c
index 07b1fb6..f4a91bd 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -18,12 +18,12 @@
 #include <stdarg.h>
 #include <sys/wait.h>
 
-#include "core.h"
-#include "socket.h"
-#include "timer.h"
-#include "mmo.h"
-#include "version.h"
-#include "lock.h"
+#include "../common/core.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/mmo.h"
+#include "../common/version.h"
+#include "../common/lock.h"
 #include "char.h"
 
 #include "inter.h"
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index 5b4fe30..e145b66 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -2,11 +2,11 @@
 #include "inter.h"
 #include "int_guild.h"
 #include "int_storage.h"
-#include "mmo.h"
+#include "../common/mmo.h"
 #include "char.h"
-#include "socket.h"
-#include "db.h"
-#include "lock.h"
+#include "../common/socket.h"
+#include "../common/db.h"
+#include "../common/lock.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/src/char/int_party.c b/src/char/int_party.c
index c501c74..c5ed033 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -1,11 +1,11 @@
 // $Id: int_party.c,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
 #include "inter.h"
 #include "int_party.h"
-#include "mmo.h"
+#include "../common/mmo.h"
 #include "char.h"
-#include "socket.h"
-#include "db.h"
-#include "lock.h"
+#include "../common/socket.h"
+#include "../common/db.h"
+#include "../common/lock.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/char/inter.c b/src/char/inter.c
index 89a3e39..5bee90f 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -1,9 +1,9 @@
 // $Id: inter.c,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#include "mmo.h"
+#include "../common/mmo.h"
 #include "char.h"
-#include "socket.h"
-#include "timer.h"
-#include "db.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/db.h"
 #include <string.h>
 #include <stdlib.h>
 
@@ -11,7 +11,7 @@
 #include "int_party.h"
 #include "int_guild.h"
 #include "int_storage.h"
-#include "lock.h"
+#include "../common/lock.h"
 
 #define WISDATA_TTL (60*1000)   // Existence time of Wisp/page data (60 seconds)
                                 // that is the waiting time of answers of all map-servers