Split directories better

1 files changed, 7 insertions, 47 deletions

diff --git a/meson.build b/meson.build
index eb446fe..1f8424a 100644
--- a/meson.build
+++ b/meson.build
@@ -13,7 +13,8 @@ conf.set_quoted('VERSION', '@0@-@VCS_TAG@'.format(meson.project_version()))
 conf.set_quoted('DEFAULT_CFG_DIR', sysconfdir)
 conf.set_quoted('DEFAULT_MAIN_CFG_FILE', mainconfname)
 
-config_h = declare_dependency(
+inc_config_h = include_directories('.')
+dep_config_h = declare_dependency(
 	sources: vcs_tag(
 		command: ['git', 'rev-parse', '--short', 'HEAD'],
 		fallback: get_option('profile') != 'default' ? 'devel' : 'stable',
@@ -23,52 +24,11 @@ config_h = declare_dependency(
 			configuration: conf
 		),
 		output: 'config.h'
-	)
+	),
+	include_directories : inc_config_h,
 )
 
-configuration_inc = include_directories('.')
-
-liburing   = dependency('liburing')
-libsystemd = dependency('libsystemd')
-libcapng   = dependency('libcap-ng')
-
-mcproxy_sources = [
-	'main.c',
-	'uring.c',
-	'signal-handler.c',
-	'server.c',
-	'server-proxy.c',
-	'server-config.c',
-	'server-rcon.c',
-	'rcon-protocol.c',
-	'announce.c',
-	'config-parser.c',
-	'idle.c',
-	'ptimer.c',
-	'igmp.c',
-	'systemd.c',
-	'utils.c'
-]
-
-mcserverctl_sources = [
-	'mcserverctl.c',
-	'rcon-protocol.c',
-]
-
-executable('mcproxy',
-	   mcproxy_sources,
-	   link_args: [ '-lanl' ],
-	   include_directories : configuration_inc,
-	   dependencies: [
-		liburing,
-		libsystemd,
-		libcapng,
-		config_h
-	   ],
-)
-
-executable('mcserverctl',
-	   mcserverctl_sources,
-	   include_directories : configuration_inc,
-)
+subdir('shared')
+subdir('mcserverproxy')
+subdir('mcserverctl')