From 592541ef7f3779933b468e869fccf5c441b5d149 Mon Sep 17 00:00:00 2001
From: "K. Lange" <klange@toaruos.org>
Date: Tue, 17 Apr 2018 22:39:39 +0900
Subject: [PATCH] Decoration themes should be no different from other libraries

---
 Makefile                      | 7 +------
 {decors => lib}/decor-fancy.c | 0
 lib/decorations.c             | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)
 rename {decors => lib}/decor-fancy.c (100%)

diff --git a/Makefile b/Makefile
index 6eb1dc2c..f02cf67e 100644
--- a/Makefile
+++ b/Makefile
@@ -131,11 +131,6 @@ base/lib/ld.so: linker/linker.c base/lib/libc.a | dirs
 
 -include ${LIBS_Y}
 
-# Decoration Themes
-
-base/lib/libtoaru-decor-fancy.so: decors/decor-fancy.c base/usr/include/toaru/decorations.h base/lib/libtoaru_graphics.so base/lib/libtoaru_decorations.so base/lib/libtoaru_drawstring.so ${LC}
-	$(CC) -o $@ $(CFLAGS) -shared -fPIC $< -ltoaru_decorations -ltoaru_drawstring -ltoaru_graphics
-
 # Init
 
 base/bin/init: apps/init.c base/lib/libc.a | dirs
@@ -150,7 +145,7 @@ base/bin/init: apps/init.c base/lib/libc.a | dirs
 
 # Ramdisk
 
-cdrom/ramdisk.img: ${APPS_X} base/lib/ld.so base/lib/libtoaru-decor-fancy.so Makefile | dirs
+cdrom/ramdisk.img: ${APPS_X} ${LIBS_X} base/lib/ld.so Makefile | dirs
 	genext2fs -B 4096 -d base -U -b 4096 -N 2048 cdrom/ramdisk.img
 
 
diff --git a/decors/decor-fancy.c b/lib/decor-fancy.c
similarity index 100%
rename from decors/decor-fancy.c
rename to lib/decor-fancy.c
diff --git a/lib/decorations.c b/lib/decorations.c
index 38252e63..6cab3d60 100644
--- a/lib/decorations.c
+++ b/lib/decorations.c
@@ -126,7 +126,7 @@ void init_decorations() {
 			options++;
 		}
 		char lib_name[100];
-		sprintf(lib_name, "libtoaru-decor-%s.so", theme);
+		sprintf(lib_name, "libtoaru_decor-%s.so", theme);
 		void * theme_lib = dlopen(lib_name, 0);
 		if (!theme_lib) {
 			goto _theme_error;