diff --git a/config.c b/config.c index 487cb90..63b4809 100644 --- a/config.c +++ b/config.c @@ -7,16 +7,10 @@ #include -#include "color.h" - -#include "decoration.h" -#include "decorations/background.h" -#include "decorations/stack.h" -#include "decorations/underline.h" - #include "bar.h" -#include "module.h" +#include "color.h" #include "config-verify.h" +#include "module.h" #include "plugin.h" static uint8_t diff --git a/decorations/CMakeLists.txt b/decorations/CMakeLists.txt index 3d5a52b..dd06e9d 100644 --- a/decorations/CMakeLists.txt +++ b/decorations/CMakeLists.txt @@ -6,13 +6,13 @@ target_include_directories(decoration-sdk INTERFACE ${CAIRO_INCLUDE_DIRS}) set(CMAKE_SHARED_MODULE_PREFIX decoration_) -add_library(background MODULE background.c background.h) +add_library(background MODULE background.c) target_link_libraries(background decoration-sdk) -add_library(stack MODULE stack.c stack.h) +add_library(stack MODULE stack.c) target_link_libraries(stack decoration-sdk) -add_library(underline MODULE underline.c underline.h) +add_library(underline MODULE underline.c) target_link_libraries(underline decoration-sdk) install( diff --git a/decorations/background.c b/decorations/background.c index ce9d5ec..0a0c218 100644 --- a/decorations/background.c +++ b/decorations/background.c @@ -1,9 +1,8 @@ -#include "background.h" - #include #include "../config.h" #include "../config-verify.h" +#include "../decoration.h" struct private { struct rgba color; diff --git a/decorations/background.h b/decorations/background.h deleted file mode 100644 index b926e2f..0000000 --- a/decorations/background.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -#include "../color.h" -#include "../decoration.h" - -struct deco *deco_background(struct rgba color); diff --git a/decorations/stack.c b/decorations/stack.c index cc97b13..38d3a74 100644 --- a/decorations/stack.c +++ b/decorations/stack.c @@ -1,11 +1,10 @@ -#include "underline.h" - #include #define LOG_MODULE "stack" #include "../log.h" #include "../config.h" #include "../config-verify.h" +#include "../decoration.h" struct private { struct deco **decos; diff --git a/decorations/stack.h b/decorations/stack.h deleted file mode 100644 index ab0380a..0000000 --- a/decorations/stack.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -#include "../color.h" -#include "../decoration.h" - -struct deco *deco_stack(struct deco *decos[], size_t count); diff --git a/decorations/underline.c b/decorations/underline.c index c0e7afa..838f9a0 100644 --- a/decorations/underline.c +++ b/decorations/underline.c @@ -1,9 +1,8 @@ -#include "underline.h" - #include #include "../config.h" #include "../config-verify.h" +#include "../decoration.h" struct private { int size; diff --git a/decorations/underline.h b/decorations/underline.h deleted file mode 100644 index 7b69ef6..0000000 --- a/decorations/underline.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -#include "../color.h" -#include "../decoration.h" - -struct deco *deco_underline(int size, struct rgba color);