From c812c92d1a1835f0bda783e709481188c8d92225 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sat, 15 Mar 2014 19:34:59 -0700 Subject: Clean up header organization --- src/admin/GNUmakefile | 7 ------- src/admin/ladmin.cpp | 17 +++++++++-------- src/admin/main.cpp | 2 ++ 3 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 src/admin/GNUmakefile (limited to 'src/admin') diff --git a/src/admin/GNUmakefile b/src/admin/GNUmakefile deleted file mode 100644 index a34b76b..0000000 --- a/src/admin/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -.SUFFIXES: -bin/tmwa-admin: - ${MAKE} -C ../.. bin/tmwa-admin -clean: - rm -r ../../obj/admin/ -%:: - ${MAKE} -C ../.. obj/admin/$@ diff --git a/src/admin/ladmin.cpp b/src/admin/ladmin.cpp index 38f0c4b..f889b19 100644 --- a/src/admin/ladmin.cpp +++ b/src/admin/ladmin.cpp @@ -11,19 +11,20 @@ #include "../strings/xstring.hpp" #include "../strings/vstring.hpp" +#include "../generic/md5.hpp" + #include "../io/cxxstdio.hpp" #include "../io/read.hpp" #include "../io/tty.hpp" #include "../io/write.hpp" -#include "../common/config_parse.hpp" -#include "../common/core.hpp" -#include "../common/human_time_diff.hpp" -#include "../common/md5calc.hpp" -#include "../common/mmo.hpp" -#include "../common/socket.hpp" -#include "../common/utils.hpp" -#include "../common/version.hpp" +#include "../mmo/config_parse.hpp" +#include "../mmo/core.hpp" +#include "../mmo/human_time_diff.hpp" +#include "../mmo/mmo.hpp" +#include "../mmo/socket.hpp" +#include "../mmo/utils.hpp" +#include "../mmo/version.hpp" #include "../poison.hpp" diff --git a/src/admin/main.cpp b/src/admin/main.cpp index 2900720..bed1539 100644 --- a/src/admin/main.cpp +++ b/src/admin/main.cpp @@ -1,2 +1,4 @@ // dummy file to make Make dependencies work #include "ladmin.hpp" + +#include "../poison.hpp" -- cgit v1.2.3-60-g2f50