Change include configuration for shared directory to make header includes clearer

16 files changed, 22 insertions, 21 deletions

diff --git a/minecctl/mc-commands.c b/minecctl/mc-commands.c
index 424eae9..648af0e 100644
--- a/minecctl/mc-commands.c
+++ b/minecctl/mc-commands.c
@@ -1,11 +1,11 @@
 #include <unistd.h>
 
-#include "utils.h"
+#include "shared/utils.h"
 #include "minecctl.h"
 #include "server.h"
 #include "mc-commands.h"
 #include "misc.h"
-#include "mc-protocol.h"
+#include "shared/mc-protocol.h"
 
 bool do_mc_pcount(struct cfg *cfg, unsigned *online, unsigned *max)
 {
diff --git a/minecctl/minecctl.c b/minecctl/minecctl.c
index 69286fc..b8d26d9 100644
--- a/minecctl/minecctl.c
+++ b/minecctl/minecctl.c
@@ -12,14 +12,13 @@
 #include <dirent.h>
 #include <termios.h>
 
-#include "utils.h"
+#include "shared/utils.h"
 #include "minecctl.h"
 #include "minecctl-commands.h"
 #include "server.h"
 #include "rcon-commands.h"
 #include "misc-commands.h"
 #include "misc.h"
-#include "config-parser.h"
 #include "config.h"
 
 static void dump_config(struct cfg *cfg)
diff --git a/minecctl/misc-commands.c b/minecctl/misc-commands.c
index a4188f9..8dd6bd2 100644
--- a/minecctl/misc-commands.c
+++ b/minecctl/misc-commands.c
@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "shared/utils.h"
 #include "minecctl.h"
 #include "server.h"
 #include "misc-commands.h"
diff --git a/minecctl/misc.c b/minecctl/misc.c
index e2d6b02..3f5ba50 100644
--- a/minecctl/misc.c
+++ b/minecctl/misc.c
@@ -5,7 +5,8 @@
 #include <string.h>
 #include <termios.h>
 
-#include "utils.h"
+#include "shared/utils.h"
+#include "misc.h"
 #include "minecctl.h"
 
 bool use_colors = false;
diff --git a/minecctl/rcon-commands.c b/minecctl/rcon-commands.c
index 2f1687b..eff397d 100644
--- a/minecctl/rcon-commands.c
+++ b/minecctl/rcon-commands.c
@@ -9,11 +9,11 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "utils.h"
+#include "shared/utils.h"
+#include "shared/rcon-protocol.h"
 #include "minecctl.h"
 #include "rcon-commands.h"
 #include "server.h"
-#include "rcon-protocol.h"
 #include "misc.h"
 
 static void send_packet(int sfd, const char *buf, size_t len)
diff --git a/minecctl/server.c b/minecctl/server.c
index 658254f..93882f1 100644
--- a/minecctl/server.c
+++ b/minecctl/server.c
@@ -3,7 +3,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "utils.h"
+#include "shared/utils.h"
 #include "minecctl.h"
 #include "server.h"
 #include "misc.h"
diff --git a/minecctl/server.h b/minecctl/server.h
index a0c0a76..61eba5f 100644
--- a/minecctl/server.h
+++ b/minecctl/server.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-#include "config-parser.h"
+#include "shared/config-parser.h"
 
 struct server {
 	bool file_read;
diff --git a/minecproxy/idle.c b/minecproxy/idle.c
index 3269a89..e237533 100644
--- a/minecproxy/idle.c
+++ b/minecproxy/idle.c
@@ -11,7 +11,7 @@
 #include "server.h"
 #include "idle.h"
 #include "ptimer.h"
-#include "mc-protocol.h"
+#include "shared/mc-protocol.h"
 
 struct idle {
 	struct ptimer_task ptask;
diff --git a/minecproxy/main.c b/minecproxy/main.c
index 92961e2..6a02531 100644
--- a/minecproxy/main.c
+++ b/minecproxy/main.c
@@ -19,7 +19,7 @@
 #include "main.h"
 #include "signal-handler.h"
 #include "uring.h"
-#include "config-parser.h"
+#include "shared/config-parser.h"
 #include "server.h"
 #include "server-config.h"
 #include "announce.h"
diff --git a/minecproxy/main.h b/minecproxy/main.h
index c46169a..b49cd72 100644
--- a/minecproxy/main.h
+++ b/minecproxy/main.h
@@ -8,7 +8,7 @@ struct cfg;
 struct uring_task;
 
 #include "misc.h"
-#include "utils.h"
+#include "shared/utils.h"
 
 extern struct cfg *cfg;
 extern bool exiting;
diff --git a/minecproxy/misc.h b/minecproxy/misc.h
index 70b84c7..559c1d7 100644
--- a/minecproxy/misc.h
+++ b/minecproxy/misc.h
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <linux/if_packet.h>
 
-#include "utils.h"
+#include "shared/utils.h"
 
 void debug_resource_usage();
 
diff --git a/minecproxy/server-config.c b/minecproxy/server-config.c
index aab9ffb..9d79af7 100644
--- a/minecproxy/server-config.c
+++ b/minecproxy/server-config.c
@@ -11,7 +11,7 @@
 
 #include "main.h"
 #include "uring.h"
-#include "config-parser.h"
+#include "shared/config-parser.h"
 #include "server.h"
 #include "server-config.h"
 #include "config.h"
diff --git a/minecproxy/server-rcon.c b/minecproxy/server-rcon.c
index 9ae49ef..1f3acfa 100644
--- a/minecproxy/server-rcon.c
+++ b/minecproxy/server-rcon.c
@@ -14,7 +14,7 @@
 #include "uring.h"
 #include "server.h"
 #include "server-rcon.h"
-#include "rcon-protocol.h"
+#include "shared/rcon-protocol.h"
 
 static int rcon_packet_complete(struct uring_task *task, _unused_ int res)
 {
diff --git a/minecproxy/server.c b/minecproxy/server.c
index 13396ef..84a50ee 100644
--- a/minecproxy/server.c
+++ b/minecproxy/server.c
@@ -17,7 +17,7 @@
 #include "server-config.h"
 #include "server-proxy.h"
 #include "server-rcon.h"
-#include "config-parser.h"
+#include "shared/config-parser.h"
 #include "idle.h"
 #include "systemd.h"
 
diff --git a/minecproxy/server.h b/minecproxy/server.h
index 6545903..da2a336 100644
--- a/minecproxy/server.h
+++ b/minecproxy/server.h
@@ -1,7 +1,7 @@
 #ifndef fooserverhfoo
 #define fooserverhfoo
 
-#include "config-parser.h"
+#include "shared/config-parser.h"
 
 /* clang-format off */
 enum server_state {
diff --git a/shared/meson.build b/shared/meson.build
index 5b15c05..f0ef635 100644
--- a/shared/meson.build
+++ b/shared/meson.build
@@ -5,8 +5,6 @@ srcs_libshared = [
 	'utils.c',
 ]
 
-inc_libshared = include_directories('.')
-
 deps_libshared = [
 	dep_config_h,
 ]
@@ -19,9 +17,12 @@ lib_libshared = static_library(
 	dependencies: deps_libshared,
 )
 
+# Note: include_directories is *not* set here so that it is necessary
+#	to include "shared/foo.h" instead of "foo.h", which makes it
+#	clearer where the header files reside.
+
 dep_libshared = declare_dependency(
 	link_with: lib_libshared,
 	dependencies: deps_libshared,
-	include_directories: inc_libshared,
 )