Use the One Makefile to build them all

This changes the names of the built binaries:
    login-server    ->  tmwa-login
    char-server     ->  tmwa-char
    map-server      ->  tmwa-map
    ladmin          ->  tmwa-admin
    eathena-monitor ->  tmwa-monitor

It also gets rid of the 'deps.make' file.

26 files changed, 50 insertions, 21 deletions

diff --git a/src/admin/GNUmakefile b/src/admin/GNUmakefile
new file mode 100644
index 0000000..a34b76b
--- /dev/null
+++ b/src/admin/GNUmakefile
@@ -0,0 +1,7 @@
+.SUFFIXES:
+bin/tmwa-admin:
+	${MAKE} -C ../.. bin/tmwa-admin
+clean:
+	rm -r ../../obj/admin/
+%::
+	${MAKE} -C ../.. obj/admin/$@
diff --git a/src/ladmin/ladmin.cpp b/src/admin/ladmin.cpp
index e0860b2..e0860b2 100644
--- a/src/ladmin/ladmin.cpp
+++ b/src/admin/ladmin.cpp
diff --git a/src/admin/ladmin.hpp b/src/admin/ladmin.hpp
new file mode 100644
index 0000000..8c7e195
--- /dev/null
+++ b/src/admin/ladmin.hpp
@@ -0,0 +1 @@
+// dummy header to make Make dependencies work
diff --git a/src/admin/main.cpp b/src/admin/main.cpp
new file mode 100644
index 0000000..2900720
--- /dev/null
+++ b/src/admin/main.cpp
@@ -0,0 +1,2 @@
+// dummy file to make Make dependencies work
+#include "ladmin.hpp"
diff --git a/src/char/GNUmakefile b/src/char/GNUmakefile
index 0e1aece..48b4c0a 100644
--- a/src/char/GNUmakefile
+++ b/src/char/GNUmakefile
@@ -1,6 +1,6 @@
 .SUFFIXES:
-all:
-	${MAKE} -C ../.. char-server
+bin/tmwa-char:
+	${MAKE} -C ../.. bin/tmwa-char
 clean:
 	rm -r ../../obj/char/
 %::
diff --git a/src/char/main.cpp b/src/char/main.cpp
new file mode 100644
index 0000000..9f68e0f
--- /dev/null
+++ b/src/char/main.cpp
@@ -0,0 +1,2 @@
+// dummy file to make Make dependencies work
+#include "char.hpp"
diff --git a/src/common/GNUmakefile b/src/common/GNUmakefile
index d8d841f..917ce0e 100644
--- a/src/common/GNUmakefile
+++ b/src/common/GNUmakefile
@@ -1,5 +1,5 @@
 .SUFFIXES:
-all:
+common:
 	${MAKE} -C ../.. common
 clean:
 	rm -r ../../obj/common/
diff --git a/src/ladmin/GNUmakefile b/src/ladmin/GNUmakefile
deleted file mode 100644
index d44f89d..0000000
--- a/src/ladmin/GNUmakefile
+++ /dev/null
@@ -1,7 +0,0 @@
-.SUFFIXES:
-all:
-	${MAKE} -C ../.. ladmin
-clean:
-	rm -r ../../obj/ladmin/
-%::
-	${MAKE} -C ../.. obj/ladmin/$@
diff --git a/src/login/GNUmakefile b/src/login/GNUmakefile
index a87b879..eb983e8 100644
--- a/src/login/GNUmakefile
+++ b/src/login/GNUmakefile
@@ -1,6 +1,6 @@
 .SUFFIXES:
-all:
-	${MAKE} -C ../.. login-server
+bin/tmwa-login:
+	${MAKE} -C ../.. bin/tmwa-login
 clean:
 	rm -r ../../obj/login/
 %::
diff --git a/src/login/login.hpp b/src/login/login.hpp
new file mode 100644
index 0000000..8c7e195
--- /dev/null
+++ b/src/login/login.hpp
@@ -0,0 +1 @@
+// dummy header to make Make dependencies work
diff --git a/src/login/main.cpp b/src/login/main.cpp
new file mode 100644
index 0000000..2ef17a0
--- /dev/null
+++ b/src/login/main.cpp
@@ -0,0 +1,2 @@
+// dummy file to make Make dependencies work
+#include "login.hpp"
diff --git a/src/map/GNUmakefile b/src/map/GNUmakefile
index 0945926..22f6daa 100644
--- a/src/map/GNUmakefile
+++ b/src/map/GNUmakefile
@@ -1,6 +1,6 @@
 .SUFFIXES:
-all:
-	${MAKE} -C ../.. map-server
+bin/tmwa-map:
+	${MAKE} -C ../.. bin/tmwa-map
 clean:
 	rm -r ../../obj/map/
 %::
diff --git a/src/map/magic-interpreter-base.cpp b/src/map/magic-interpreter-base.cpp
index 1a80617..3167efb 100644
--- a/src/map/magic-interpreter-base.cpp
+++ b/src/map/magic-interpreter-base.cpp
@@ -1,3 +1,5 @@
+#include "magic-interpreter-base.hpp"
+
 #include "magic-interpreter-aux.hpp"
 #include "magic-interpreter.hpp"
 
diff --git a/src/map/magic-interpreter-base.hpp b/src/map/magic-interpreter-base.hpp
new file mode 100644
index 0000000..8c7e195
--- /dev/null
+++ b/src/map/magic-interpreter-base.hpp
@@ -0,0 +1 @@
+// dummy header to make Make dependencies work
diff --git a/src/map/magic-interpreter-lexer.hpp b/src/map/magic-interpreter-lexer.hpp
new file mode 100644
index 0000000..8c7e195
--- /dev/null
+++ b/src/map/magic-interpreter-lexer.hpp
@@ -0,0 +1 @@
+// dummy header to make Make dependencies work
diff --git a/src/map/magic-interpreter-lexer.lpp b/src/map/magic-interpreter-lexer.lpp
index a7c25e5..b5a16b2 100644
--- a/src/map/magic-interpreter-lexer.lpp
+++ b/src/map/magic-interpreter-lexer.lpp
@@ -1,4 +1,6 @@
 %{
+#include "magic-interpreter-lexer.hpp"
+#
 #include "magic-interpreter-parser.hpp"
 
 #include "../common/cxxstdio.hpp"
diff --git a/src/map/magic-stmt.cpp b/src/map/magic-stmt.cpp
index 6b013ab..12fed6e 100644
--- a/src/map/magic-stmt.cpp
+++ b/src/map/magic-stmt.cpp
@@ -1,3 +1,5 @@
+#include "magic-stmt.hpp"
+
 #include <cassert>
 
 #include "../common/cxxstdio.hpp"
diff --git a/src/map/magic-stmt.hpp b/src/map/magic-stmt.hpp
new file mode 100644
index 0000000..8c7e195
--- /dev/null
+++ b/src/map/magic-stmt.hpp
@@ -0,0 +1 @@
+// dummy header to make Make dependencies work
diff --git a/src/map/magic.cpp b/src/map/magic.cpp
index 9c07dd1..b6dc806 100644
--- a/src/map/magic.cpp
+++ b/src/map/magic.cpp
@@ -3,8 +3,16 @@
 #include "../common/cxxstdio.hpp"
 
 #include "magic-interpreter.hpp"
+
 #include "pc.hpp"
 
+#include "magic-expr.hpp"
+#include "magic-interpreter-base.hpp"
+#include "magic-interpreter-lexer.hpp"
+#include "magic-interpreter-parser.hpp"
+#include "magic-stmt.hpp"
+#include "magic.hpp"
+
 #include "../poison.hpp"
 
 #undef DEBUG
diff --git a/src/map/main.cpp b/src/map/main.cpp
new file mode 100644
index 0000000..c930630
--- /dev/null
+++ b/src/map/main.cpp
@@ -0,0 +1,2 @@
+// dummy file to make Make dependencies work
+#include "map.hpp"
diff --git a/src/map/skill-pools.hpp b/src/map/skill-pools.hpp
new file mode 100644
index 0000000..8c7e195
--- /dev/null
+++ b/src/map/skill-pools.hpp
@@ -0,0 +1 @@
+// dummy header to make Make dependencies work
diff --git a/src/map/skill.hpp b/src/map/skill.hpp
index bcd0261..a233ed4 100644
--- a/src/map/skill.hpp
+++ b/src/map/skill.hpp
@@ -2,6 +2,7 @@
 #define SKILL_HPP
 
 #include "skill.t.hpp"
+#include "skill-pools.hpp"
 
 #include "../common/strings.hpp"
 
diff --git a/src/monitor/GNUmakefile b/src/monitor/GNUmakefile
new file mode 100644
index 0000000..42efa8b
--- /dev/null
+++ b/src/monitor/GNUmakefile
@@ -0,0 +1,7 @@
+.SUFFIXES:
+bin/tmwa-monitor:
+	${MAKE} -C ../.. bin/tmwa-monitor
+clean:
+	rm -r ../../obj/monitor/
+%::
+	${MAKE} -C ../.. obj/monitor/$@
diff --git a/src/tool/eathena-monitor.cpp b/src/monitor/main.cpp
index f6e8271..f6e8271 100644
--- a/src/tool/eathena-monitor.cpp
+++ b/src/monitor/main.cpp
diff --git a/src/tests/main.cpp b/src/tests/test.cpp
index 96d7200..96d7200 100644
--- a/src/tests/main.cpp
+++ b/src/tests/test.cpp
diff --git a/src/tool/GNUmakefile b/src/tool/GNUmakefile
deleted file mode 100644
index 24ee766..0000000
--- a/src/tool/GNUmakefile
+++ /dev/null
@@ -1,7 +0,0 @@
-.SUFFIXES:
-all:
-	${MAKE} -C ../.. eathena-monitor
-clean:
-	rm -r ../../obj/tool/
-%::
-	${MAKE} -C ../.. obj/tool/$@