From e7e7284cba2591ba9473035acd2edf32d3aadb5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sat, 12 Jan 2019 21:20:52 +0100 Subject: [PATCH] modules: remove header files --- modules/CMakeLists.txt | 22 +++++++++++----------- modules/alsa/alsa.c | 2 -- modules/alsa/alsa.h | 4 ---- modules/backlight/backlight.c | 2 -- modules/backlight/backlight.h | 4 ---- modules/battery/battery.c | 2 -- modules/battery/battery.h | 4 ---- modules/clock/clock.c | 1 - modules/clock/clock.h | 4 ---- modules/i3/i3.c | 2 -- modules/i3/i3.h | 4 ---- modules/label/label.c | 2 -- modules/label/label.h | 4 ---- modules/mpd/mpd.c | 2 -- modules/mpd/mpd.h | 4 ---- modules/network/network.c | 2 -- modules/network/network.h | 4 ---- modules/removables/removables.c | 2 -- modules/removables/removables.h | 4 ---- modules/xkb/xkb.c | 2 -- modules/xkb/xkb.h | 4 ---- modules/xwindow/xwindow.c | 2 -- modules/xwindow/xwindow.h | 4 ---- 23 files changed, 11 insertions(+), 76 deletions(-) delete mode 100644 modules/alsa/alsa.h delete mode 100644 modules/backlight/backlight.h delete mode 100644 modules/battery/battery.h delete mode 100644 modules/clock/clock.h delete mode 100644 modules/i3/i3.h delete mode 100644 modules/label/label.h delete mode 100644 modules/mpd/mpd.h delete mode 100644 modules/network/network.h delete mode 100644 modules/removables/removables.h delete mode 100644 modules/xkb/xkb.h delete mode 100644 modules/xwindow/xwindow.h diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 285ff58..9df5a96 100644 --- a/modules/CMakeLists.txt +++ b/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 alsa/alsa.h) +add_library(alsa MODULE alsa/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 backlight/backlight.h) +add_library(backlight MODULE backlight/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 battery/battery.h) +add_library(battery MODULE battery/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 clock/clock.h) +add_library(clock MODULE clock/clock.c) target_link_libraries(clock module-sdk) pkg_check_modules(JSON REQUIRED json-c) -add_library(i3 MODULE i3/i3.c i3/i3.h) +add_library(i3 MODULE i3/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 label/label.h) +add_library(label MODULE label/label.c) target_link_libraries(label module-sdk) pkg_check_modules(MPD REQUIRED libmpdclient) -add_library(mpd MODULE mpd/mpd.c mpd/mpd.h) +add_library(mpd MODULE mpd/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 network/network.h) +add_library(network MODULE network/network.c) target_link_libraries(network module-sdk) -add_library(removables MODULE removables/removables.c removables/removables.h) +add_library(removables MODULE removables/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 xkb/xkb.h) +add_library(xkb MODULE xkb/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 xwindow/xwindow.h) +add_library(xwindow MODULE xwindow/xwindow.c) target_link_libraries(xwindow module-sdk) install( diff --git a/modules/alsa/alsa.c b/modules/alsa/alsa.c index 856d7fe..bb4be50 100644 --- a/modules/alsa/alsa.c +++ b/modules/alsa/alsa.c @@ -1,5 +1,3 @@ -#include "alsa.h" - #include #include diff --git a/modules/alsa/alsa.h b/modules/alsa/alsa.h deleted file mode 100644 index a19c122..0000000 --- a/modules/alsa/alsa.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "../../module.h" - -extern const struct module_info module_alsa; diff --git a/modules/backlight/backlight.c b/modules/backlight/backlight.c index f8f9975..420fd2b 100644 --- a/modules/backlight/backlight.c +++ b/modules/backlight/backlight.c @@ -1,5 +1,3 @@ -#include "backlight.h" - #include #include #include diff --git a/modules/backlight/backlight.h b/modules/backlight/backlight.h deleted file mode 100644 index f390f2e..0000000 --- a/modules/backlight/backlight.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "../../module.h" - -extern const struct module_info module_backlight; diff --git a/modules/battery/battery.c b/modules/battery/battery.c index 69bb4ea..172041a 100644 --- a/modules/battery/battery.c +++ b/modules/battery/battery.c @@ -1,5 +1,3 @@ -#include "battery.h" - #include #include #include diff --git a/modules/battery/battery.h b/modules/battery/battery.h deleted file mode 100644 index e8d89be..0000000 --- a/modules/battery/battery.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "../../module.h" - -extern const struct module_info module_battery; diff --git a/modules/clock/clock.c b/modules/clock/clock.c index 74c1664..eda4b32 100644 --- a/modules/clock/clock.c +++ b/modules/clock/clock.c @@ -1,4 +1,3 @@ -#include "clock.h" #include #include #include diff --git a/modules/clock/clock.h b/modules/clock/clock.h deleted file mode 100644 index 990ff64..0000000 --- a/modules/clock/clock.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "../../module.h" - -extern const struct module_info module_clock; diff --git a/modules/i3/i3.c b/modules/i3/i3.c index f3f52c2..9e1234d 100644 --- a/modules/i3/i3.c +++ b/modules/i3/i3.c @@ -1,5 +1,3 @@ -#include "i3.h" - #include #include #include diff --git a/modules/i3/i3.h b/modules/i3/i3.h deleted file mode 100644 index de1c0ae..0000000 --- a/modules/i3/i3.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "../../module.h" - -extern const struct module_info module_i3; diff --git a/modules/label/label.c b/modules/label/label.c index 3f97216..d23f031 100644 --- a/modules/label/label.c +++ b/modules/label/label.c @@ -1,5 +1,3 @@ -#include "label.h" - #include #include diff --git a/modules/label/label.h b/modules/label/label.h deleted file mode 100644 index b181d2d..0000000 --- a/modules/label/label.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "../../module.h" - -extern const struct module_info module_label; diff --git a/modules/mpd/mpd.c b/modules/mpd/mpd.c index a17008d..01076ed 100644 --- a/modules/mpd/mpd.c +++ b/modules/mpd/mpd.c @@ -1,5 +1,3 @@ -#include "mpd.h" - #include #include #include diff --git a/modules/mpd/mpd.h b/modules/mpd/mpd.h deleted file mode 100644 index 57959e1..0000000 --- a/modules/mpd/mpd.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "../../module.h" - -extern const struct module_info module_mpd; diff --git a/modules/network/network.c b/modules/network/network.c index 0444c70..88f2c86 100644 --- a/modules/network/network.c +++ b/modules/network/network.c @@ -1,5 +1,3 @@ -#include "network.h" - #include #include #include diff --git a/modules/network/network.h b/modules/network/network.h deleted file mode 100644 index 2c7aa57..0000000 --- a/modules/network/network.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "../../module.h" - -extern const struct module_info module_network; diff --git a/modules/removables/removables.c b/modules/removables/removables.c index 2b64707..e040aaf 100644 --- a/modules/removables/removables.c +++ b/modules/removables/removables.c @@ -1,5 +1,3 @@ -#include "removables.h" - #include #include #include diff --git a/modules/removables/removables.h b/modules/removables/removables.h deleted file mode 100644 index d5e96aa..0000000 --- a/modules/removables/removables.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "../../module.h" - -extern const struct module_info module_removables; diff --git a/modules/xkb/xkb.c b/modules/xkb/xkb.c index b299a80..eea3c55 100644 --- a/modules/xkb/xkb.c +++ b/modules/xkb/xkb.c @@ -1,5 +1,3 @@ -#include "xkb.h" - #include #include #include diff --git a/modules/xkb/xkb.h b/modules/xkb/xkb.h deleted file mode 100644 index d38743e..0000000 --- a/modules/xkb/xkb.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "../../module.h" - -extern const struct module_info module_xkb; diff --git a/modules/xwindow/xwindow.c b/modules/xwindow/xwindow.c index 4114e69..1208ed7 100644 --- a/modules/xwindow/xwindow.c +++ b/modules/xwindow/xwindow.c @@ -1,5 +1,3 @@ -#include "xwindow.h" - #include #include #include diff --git a/modules/xwindow/xwindow.h b/modules/xwindow/xwindow.h deleted file mode 100644 index 0f67953..0000000 --- a/modules/xwindow/xwindow.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "../../module.h" - -extern const struct module_info module_xwindow;