From 14f09400cf2e2180c6815c8460d32866a016ba9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= Date: Fri, 17 Mar 2023 18:41:06 +0100 Subject: [PATCH] Fix Makefile scripts --- share/themes/Kali-Dark/gtk-4.0/assets | 2 +- share/themes/Kali-Light/gtk-3.0/assets | 2 +- share/themes/Kali-Light/gtk-4.0/assets | 2 +- share/themes/Kali-Purple-Light/gtk-3.0/assets | 2 +- share/themes/Kali-Purple-Light/gtk-4.0/assets | 2 +- src/themes/Kali/assets-renderer/gtk3/Makefile | 6 +++--- src/themes/Kali/sass/Makefile | 4 +++- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/share/themes/Kali-Dark/gtk-4.0/assets b/share/themes/Kali-Dark/gtk-4.0/assets index dff0b417..fb2256c4 120000 --- a/share/themes/Kali-Dark/gtk-4.0/assets +++ b/share/themes/Kali-Dark/gtk-4.0/assets @@ -1 +1 @@ -../../Kali-Purple-Dark/gtk-3.0/assets \ No newline at end of file +../gtk-3.0/assets \ No newline at end of file diff --git a/share/themes/Kali-Light/gtk-3.0/assets b/share/themes/Kali-Light/gtk-3.0/assets index dff0b417..3c99dc53 120000 --- a/share/themes/Kali-Light/gtk-3.0/assets +++ b/share/themes/Kali-Light/gtk-3.0/assets @@ -1 +1 @@ -../../Kali-Purple-Dark/gtk-3.0/assets \ No newline at end of file +../../Kali-Dark/gtk-3.0/assets \ No newline at end of file diff --git a/share/themes/Kali-Light/gtk-4.0/assets b/share/themes/Kali-Light/gtk-4.0/assets index dff0b417..3c99dc53 120000 --- a/share/themes/Kali-Light/gtk-4.0/assets +++ b/share/themes/Kali-Light/gtk-4.0/assets @@ -1 +1 @@ -../../Kali-Purple-Dark/gtk-3.0/assets \ No newline at end of file +../../Kali-Dark/gtk-3.0/assets \ No newline at end of file diff --git a/share/themes/Kali-Purple-Light/gtk-3.0/assets b/share/themes/Kali-Purple-Light/gtk-3.0/assets index 3c99dc53..dff0b417 120000 --- a/share/themes/Kali-Purple-Light/gtk-3.0/assets +++ b/share/themes/Kali-Purple-Light/gtk-3.0/assets @@ -1 +1 @@ -../../Kali-Dark/gtk-3.0/assets \ No newline at end of file +../../Kali-Purple-Dark/gtk-3.0/assets \ No newline at end of file diff --git a/share/themes/Kali-Purple-Light/gtk-4.0/assets b/share/themes/Kali-Purple-Light/gtk-4.0/assets index 3c99dc53..dff0b417 120000 --- a/share/themes/Kali-Purple-Light/gtk-4.0/assets +++ b/share/themes/Kali-Purple-Light/gtk-4.0/assets @@ -1 +1 @@ -../../Kali-Dark/gtk-3.0/assets \ No newline at end of file +../../Kali-Purple-Dark/gtk-3.0/assets \ No newline at end of file diff --git a/src/themes/Kali/assets-renderer/gtk3/Makefile b/src/themes/Kali/assets-renderer/gtk3/Makefile index 4c327b68..e3c7d8ce 100644 --- a/src/themes/Kali/assets-renderer/gtk3/Makefile +++ b/src/themes/Kali/assets-renderer/gtk3/Makefile @@ -32,9 +32,9 @@ build: $(SRC_FILE) mkdir -p $(THEMES_DIR)Kali$(VARIANT)-Light/gtk-3.0/ mkdir -p $(THEMES_DIR)Kali$(VARIANT)-Light/gtk-4.0/ cp assets/* $(THEMES_DIR)Kali$(VARIANT)-Dark/gtk-3.0/assets/ - ln -nrsvf $(THEMES_DIR)Kali$(VARIANT)-Dark/gtk-3.0/assets/ $(THEMES_DIR)Kali-Light/gtk-3.0/assets - ln -nrsvf $(THEMES_DIR)Kali$(VARIANT)-Dark/gtk-3.0/assets/ $(THEMES_DIR)Kali-Dark/gtk-4.0/assets - ln -nrsvf $(THEMES_DIR)Kali$(VARIANT)-Dark/gtk-3.0/assets/ $(THEMES_DIR)Kali-Light/gtk-4.0/assets + ln -nrsvf $(THEMES_DIR)Kali$(VARIANT)-Dark/gtk-3.0/assets/ $(THEMES_DIR)Kali$(VARIANT)-Light/gtk-3.0/assets + ln -nrsvf $(THEMES_DIR)Kali$(VARIANT)-Dark/gtk-3.0/assets/ $(THEMES_DIR)Kali$(VARIANT)-Dark/gtk-4.0/assets + ln -nrsvf $(THEMES_DIR)Kali$(VARIANT)-Dark/gtk-3.0/assets/ $(THEMES_DIR)Kali$(VARIANT)-Light/gtk-4.0/assets clean: -rm -r $(ASSETS_DIR) diff --git a/src/themes/Kali/sass/Makefile b/src/themes/Kali/sass/Makefile index 37b14e32..93c1dd9e 100644 --- a/src/themes/Kali/sass/Makefile +++ b/src/themes/Kali/sass/Makefile @@ -1,10 +1,12 @@ include ../../Makefile.inc THEMES_DIR=../../../../share/themes/ +TARGETS=$(patsubst %.scss, %.css, $(wildcard *.scss)) .PHONY: build clean -build: clean $(patsubst %.scss, %.css, $(wildcard *.scss)) +build: clean + $(MAKE) $(TARGETS) mkdir -p $(THEMES_DIR)Kali$(VARIANT)-Light/gtk-3.0/ mkdir -p $(THEMES_DIR)Kali$(VARIANT)-Dark/gtk-3.0/ mkdir -p $(THEMES_DIR)Kali$(VARIANT)-Light/gtk-4.0/