modules: move files back to a common directory (again)

modules/CMakeLists.txt

@@ -1,56 +1,56 @@
 cmake_minimum_required(VERSION 3.13)
 
 pkg_check_modules(ALSA REQUIRED alsa)
-add_library(alsa MODULE alsa/alsa.c)
+add_library(alsa MODULE alsa.c)
 target_compile_options(alsa PRIVATE ${ALSA_CFLAGS_OTHER})
 target_include_directories(alsa PRIVATE ${ALSA_INCLUDE_DIRS})
 target_link_libraries(alsa module-sdk ${ALSA_LIBRARIES})
 
 pkg_check_modules(UDEV REQUIRED libudev)
-add_library(backlight MODULE backlight/backlight.c)
+add_library(backlight MODULE backlight.c)
 target_compile_options(backlight PRIVATE ${UDEV_CFLAGS_OTHER})
 target_include_directories(backlight PRIVATE ${UDEV_INCLUDE_DIRS})
 target_link_libraries(backlight module-sdk ${UDEV_LIBRARIES})
 
-add_library(battery MODULE battery/battery.c)
+add_library(battery MODULE battery.c)
 target_compile_options(battery PRIVATE ${UDEV_CFLAGS_OTHER})
 target_include_directories(battery PRIVATE ${UDEV_INCLUDE_DIRS})
 target_link_libraries(battery module-sdk ${UDEV_LIBRARIES})
 
-add_library(clock MODULE clock/clock.c)
+add_library(clock MODULE clock.c)
 target_link_libraries(clock module-sdk)
 
 pkg_check_modules(JSON REQUIRED json-c)
-add_library(i3 MODULE i3/i3.c)
+add_library(i3 MODULE i3.c)
 target_compile_options(i3 PRIVATE ${JSON_CFLAGS_OTHER})
 target_include_directories(i3 PRIVATE ${JSON_INCLUDE_DIRS})
 target_link_libraries(i3 module-sdk ${JSON_LIBRARIES})
 
 
-add_library(label MODULE label/label.c)
+add_library(label MODULE label.c)
 target_link_libraries(label module-sdk)
 
 pkg_check_modules(MPD REQUIRED libmpdclient)
-add_library(mpd MODULE mpd/mpd.c)
+add_library(mpd MODULE mpd.c)
 target_compile_options(mpd PRIVATE ${MPD_CFLAGS_OTHER})
 target_include_directories(mpd PRIVATE ${MPD_INCLUDE_DIRS})
 target_link_libraries(mpd module-sdk ${MPD_LIBRARIES})
 
-add_library(network MODULE network/network.c)
+add_library(network MODULE network.c)
 target_link_libraries(network module-sdk)
 
-add_library(removables MODULE removables/removables.c)
+add_library(removables MODULE removables.c)
 target_compile_options(removables PRIVATE ${UDEV_CFLAGS_OTHER})
 target_include_directories(removables PRIVATE ${UDEV_INCLUDE_DIRS})
 target_link_libraries(removables module-sdk ${UDEV_LIBRARIES})
 
 pkg_check_modules(XCB_XKB REQUIRED xcb-xkb)
-add_library(xkb MODULE xkb/xkb.c)
+add_library(xkb MODULE xkb.c)
 target_compile_options(xkb PRIVATE ${XCB_XKB_CFLAGS_OTHER})
 target_include_directories(xkb PRIVATE ${XCB_XKB_INCLUDE_DIRS})
 target_link_libraries(xkb module-sdk ${XCB_XKB_LIBRARIES})
 
-add_library(xwindow MODULE xwindow/xwindow.c)
+add_library(xwindow MODULE xwindow.c)
 target_link_libraries(xwindow module-sdk)
 
 install(

modules/alsa.c

@@ -5,10 +5,10 @@
 
 #define LOG_MODULE "alsa"
 #define LOG_ENABLE_DBG 0
-#include "../../log.h"
-#include "../../bar.h"
-#include "../../config.h"
-#include "../../tllist.h"
+#include "../log.h"
+#include "../bar.h"
+#include "../config.h"
+#include "../tllist.h"
 
 struct private {
     char *card;

modules/backlight.c

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

modules/battery.c

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

modules/clock.c

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

modules/i3.c

@@ -17,11 +17,11 @@
 
 #define LOG_MODULE "i3"
 #define LOG_ENABLE_DBG 0
-#include "../../log.h"
-#include "../../bar.h"
-#include "../../config.h"
+#include "../log.h"
+#include "../bar.h"
+#include "../config.h"
 
-#include "../../particles/dynlist.h"
+#include "../particles/dynlist.h"
 
 struct ws_content {
     char *name;

modules/label.c

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

modules/mpd.c

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

modules/network.c

@@ -14,11 +14,11 @@
 
 #define LOG_MODULE "network"
 #define LOG_ENABLE_DBG 0
-#include "../../log.h"
-#include "../../bar.h"
-#include "../../config.h"
-#include "../../module.h"
-#include "../../tllist.h"
+#include "../log.h"
+#include "../bar.h"
+#include "../config.h"
+#include "../module.h"
+#include "../tllist.h"
 
 struct af_addr {
     int family;

modules/removables.c

@@ -14,11 +14,11 @@
 
 #define LOG_MODULE "removables"
 #define LOG_ENABLE_DBG 0
-#include "../../log.h"
-#include "../../bar.h"
-#include "../../config.h"
-#include "../../particles/dynlist.h"
-#include "../../tllist.h"
+#include "../log.h"
+#include "../bar.h"
+#include "../config.h"
+#include "../particles/dynlist.h"
+#include "../tllist.h"
 
 typedef tll(char *) mount_point_list_t;
 

modules/xkb.c

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

modules/xwindow.c

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