mv theme.c ..

src/deco.c

@@ -7,7 +7,6 @@
 #include <assert.h>
 #include "config/rcxml.h"
 #include "labwc.h"
-#include "theme/theme.h"
 
 #define BORDER_WIDTH (2)
 

src/main.c

@@ -3,7 +3,7 @@
 #include "common/spawn.h"
 #include "config/session.h"
 #include "labwc.h"
-#include "theme/theme.h"
+#include "theme.h"
 #include "xbm/xbm.h"
 #include "menu/menu.h"
 

src/menu/menu.c

@@ -16,7 +16,7 @@
 #include "common/string-helpers.h"
 #include "labwc.h"
 #include "menu/menu.h"
-#include "theme/theme.h"
+#include "theme.h"
 
 static const char font[] = "Sans 8";
 

src/meson.build

@@ -12,6 +12,7 @@ labwc_sources = files(
   'output.c',
   'seat.c',
   'server.c',
+  'theme.c',
   'view.c',
   'xdg.c',
 )
@@ -26,6 +27,5 @@ endif
 
 subdir('common')
 subdir('config')
-subdir('theme')
 subdir('xbm')
 subdir('menu')

src/output.c

@@ -12,7 +12,7 @@
 #include <wlr/util/region.h>
 #include "labwc.h"
 #include "menu/menu.h"
-#include "theme/theme.h"
+#include "theme.h"
 #include "layers.h"
 
 //#define DEBUG 1

src/server.c

@@ -12,7 +12,7 @@
 #include "labwc.h"
 #include "layers.h"
 #include "menu/menu.h"
-#include "theme/theme.h"
+#include "theme.h"
 
 static struct wlr_compositor *compositor;
 static struct wl_event_source *sighup_source;

src/theme.c

@@ -10,7 +10,7 @@
 #include "common/log.h"
 #include "common/string-helpers.h"
 #include "common/zfree.h"
-#include "theme/theme.h"
+#include "theme.h"
 #include "xbm/xbm.h"
 
 static int

src/theme/meson.build

@@ -1,4 +0,0 @@
-labwc_sources += files(
-  'theme.c',
-)
-

src/xbm/xbm.c

@@ -10,7 +10,7 @@
 #include "common/dir.h"
 #include "common/grab-file.h"
 #include "config/rcxml.h"
-#include "theme/theme.h"
+#include "theme.h"
 #include "xbm/parse.h"
 #include "xbm/xbm.h"