Put code in src/ and include/

meson.build

@@ -18,64 +18,40 @@ add_project_arguments(
 
 cc = meson.get_compiler('c')
 
-add_project_arguments(cc.get_supported_arguments([
+add_project_arguments(cc.get_supported_arguments(
-	'-Wundef',
+  [
-	'-Wlogical-op',
+    '-Wno-unused-parameter',
-	'-Wmissing-include-dirs',
+    '-Wundef',
-	'-Wold-style-definition',
+  ]),
-	'-Wpointer-arith',
+  language: 'c',
-	'-Winit-self',
+)
-	'-Wstrict-prototypes',
-	'-Wimplicit-fallthrough=2',
-	'-Wendif-labels',
-	'-Wstrict-aliasing=2',
-	'-Woverflow',
-	'-Wmissing-prototypes',
-	'-Wno-missing-braces',
-	'-Wno-missing-field-initializers',
-	'-Wno-unused-parameter',
-]), language: 'c')
 
 wlroots_proj = subproject(
-	'wlroots',
+  'wlroots',
-	default_options: ['examples=false'],
+  default_options: ['examples=false'],
-	required: false,
+  required: false,
 )
-if wlroots_proj.found()
-	wlroots = wlroots_proj.get_variable('wlroots')
-else
-	wlroots = dependency('wlroots', version: '>= 0.10.0')
-endif
 
-wayland_protos = dependency('wayland-protocols')
+if wlroots_proj.found()
-wayland_server = dependency('wayland-server')
+  wlroots       = wlroots_proj.get_variable('wlroots')
-xkbcommon      = dependency('xkbcommon')
+else
+  wlroots       = dependency('wlroots', version: '>= 0.10.0')
+endif
+wayland_server  = dependency('wayland-server')
+wayland_protos  = dependency('wayland-protocols')
+xkbcommon       = dependency('xkbcommon')
+
+labwc_inc       = include_directories('include')
 
 subdir('protocols')
+subdir('src')
 
-labwc_sources = [
+labwc_deps      = [ server_protos, wayland_server, wlroots, xkbcommon, ]
-  'main.c',
-  'server.c',
-  'output.c',
-  'view.c',
-  'xdg.c',
-  'xwl.c',
-  'deco.c',
-  'dbg.c',
-]
-
-labwc_headers = [
-  'labwc.h',
-]
 
 executable(
   meson.project_name(),
-  labwc_sources + labwc_headers,
+  labwc_sources,
-  dependencies: [
+  include_directories: [labwc_inc],
-    server_protos,
+  dependencies: labwc_deps,
-    wayland_server,
-    wlroots,
-    xkbcommon,
-  ],
   install: true,
 )

src/debug/meson.build

@@ -0,0 +1,3 @@
+labwc_sources += files(
+  'dbg.c',
+)

src/meson.build

@@ -0,0 +1,11 @@
+labwc_sources = files(
+  'main.c',
+  'server.c',
+  'output.c',
+  'view.c',
+  'xdg.c',
+  'xwl.c',
+  'deco.c',
+)
+
+subdir('debug')