remove module subfolders

CMakeLists.txt

@@ -48,14 +48,14 @@ add_executable(f00bar
   particles/ramp.c particles/ramp.h
   particles/string.c particles/string.h
 
-  modules/backlight/backlight.c modules/backlight/backlight.h
-  modules/battery/battery.c modules/battery/battery.h
-  modules/clock/clock.c modules/clock/clock.h
-  modules/i3/i3.c modules/i3/i3.h
-  modules/label/label.c modules/label/label.h
-  modules/mpd/mpd.c modules/mpd/mpd.h
-  modules/xkb/xkb.c modules/xkb/xkb.h
-  modules/xwindow/xwindow.c modules/xwindow/xwindow.h
+  modules/backlight.c modules/backlight.h
+  modules/battery.c modules/battery.h
+  modules/clock.c modules/clock.h
+  modules/i3.c modules/i3.h
+  modules/label.c modules/label.h
+  modules/mpd.c modules/mpd.h
+  modules/xkb.c modules/xkb.h
+  modules/xwindow.c modules/xwindow.h
   )
 
 target_compile_definitions(f00bar PRIVATE _GNU_SOURCE)

config.c

@@ -21,14 +21,14 @@
 #include "particles/string.h"
 
 #include "module.h"
-#include "modules/backlight/backlight.h"
-#include "modules/battery/battery.h"
-#include "modules/clock/clock.h"
-#include "modules/i3/i3.h"
-#include "modules/label/label.h"
-#include "modules/mpd/mpd.h"
-#include "modules/xkb/xkb.h"
-#include "modules/xwindow/xwindow.h"
+#include "modules/backlight.h"
+#include "modules/battery.h"
+#include "modules/clock.h"
+#include "modules/i3.h"
+#include "modules/label.h"
+#include "modules/mpd.h"
+#include "modules/xkb.h"
+#include "modules/xwindow.h"
 
 static uint8_t
 hex_nibble(char hex)

modules/backlight.c

@@ -13,8 +13,8 @@
 #include <libudev.h>
 
 #define LOG_MODULE "battery"
-#include "../../log.h"
-#include "../../bar.h"
+#include "../log.h"
+#include "../bar.h"
 
 struct private {
     struct particle *label;

modules/backlight.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../module.h"
-#include "../../particle.h"
+#include "../module.h"
+#include "../particle.h"
 
 struct module *module_backlight(const char *device, struct particle *label);

modules/battery.c

@@ -14,8 +14,8 @@
 #include <libudev.h>
 
 #define LOG_MODULE "battery"
-#include "../../log.h"
-#include "../../bar.h"
+#include "../log.h"
+#include "../bar.h"
 
 enum state { STATE_FULL, STATE_CHARGING, STATE_DISCHARGING };
 

modules/battery.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../module.h"
-#include "../../particle.h"
+#include "../module.h"
+#include "../particle.h"
 
 struct module *module_battery(
     const char *battery, struct particle *label, int poll_interval_secs);

modules/clock.c

@@ -5,7 +5,7 @@
 
 #include <poll.h>
 
-#include "../../bar.h"
+#include "../bar.h"
 
 struct private {
     struct particle *label;

modules/clock.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../module.h"
-#include "../../particle.h"
+#include "../module.h"
+#include "../particle.h"
 
 struct module *module_clock(struct particle *label);

modules/i3.c

@@ -18,10 +18,10 @@
 #include <json-c/linkhash.h>
 
 #define LOG_MODULE "i3"
-#include "../../log.h"
-#include "../../bar.h"
+#include "../log.h"
+#include "../bar.h"
 
-#include "../../particles/dynlist.h"
+#include "../particles/dynlist.h"
 
 struct ws_content {
     char *name;

modules/i3.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../module.h"
-#include "../../particle.h"
+#include "../module.h"
+#include "../particle.h"
 
 /* Maps workspace name to a content particle. */
 struct i3_workspaces {

modules/label.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../module.h"
-#include "../../particle.h"
+#include "../module.h"
+#include "../particle.h"
 
 struct module *module_label(struct particle *label);

modules/mpd.c

@@ -16,8 +16,8 @@
 
 #define LOG_MODULE "mpd"
 #define LOG_ENABLE_DBG 0
-#include "../../log.h"
-#include "../../bar.h"
+#include "../log.h"
+#include "../bar.h"
 
 enum state {
     STATE_OFFLINE = 1000,

modules/mpd.h

@@ -2,8 +2,8 @@
 
 #include <stdint.h>
 
-#include "../../module.h"
-#include "../../particle.h"
+#include "../module.h"
+#include "../particle.h"
 
 struct module *module_mpd(
     const char *host, uint16_t port, struct particle *label);

modules/xkb.c

@@ -11,9 +11,9 @@
 #include <xcb/xkb.h>
 
 #define LOG_MODULE "xkb"
-#include "../../log.h"
-#include "../../bar.h"
-#include "../../xcb.h"
+#include "../log.h"
+#include "../bar.h"
+#include "../xcb.h"
 
 struct layout {
     char *name;

modules/xkb.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "../../module.h"
-#include "../../particle.h"
+#include "../module.h"
+#include "../particle.h"
 
 struct module *module_xkb(struct particle *label);

modules/xwindow.c

@@ -15,9 +15,9 @@
 #include <xcb/xcb_event.h>
 
 #define LOG_MODULE "xkb"
-#include "../../log.h"
-#include "../../bar.h"
-#include "../../xcb.h"
+#include "../log.h"
+#include "../bar.h"
+#include "../xcb.h"
 
 struct private {
     /* Accessed from bar thread only */

modules/xwindow.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../module.h"
-#include "../../particle.h"
+#include "../module.h"
+#include "../particle.h"
 
 struct module *module_xwindow(struct particle *label);