58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
From 017d2922f54cbc5b7caa05ae002d83ffdcffa9b4 Mon Sep 17 00:00:00 2001
|
||
From: yuanxing <yuanxing@kylinos.com.cn>
|
||
Date: Tue, 26 Jan 2021 23:55:56 +0800
|
||
Subject: [PATCH 5/9] fix:generate resource.mk file to ensure generate
|
||
gresource.h file
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
- 生成resource.mk文件，确保能够编译生成gresource.h文件
|
||
---
|
||
src/themes/kiran/Makefile.am | 19 +++++++++++++------
|
||
1 file changed, 13 insertions(+), 6 deletions(-)
|
||
|
||
diff --git a/src/themes/kiran/Makefile.am b/src/themes/kiran/Makefile.am
|
||
index fcb1626..c3f0494 100644
|
||
--- a/src/themes/kiran/Makefile.am
|
||
+++ b/src/themes/kiran/Makefile.am
|
||
@@ -8,21 +8,28 @@ GLIB_COMPILE_RESOURCE=glib-compile-resources
|
||
|
||
AM_CPPFLAGS = $(THEME_CFLAGS)
|
||
|
||
-gresource.c: $(RESOURCE_XML)
|
||
- $(GLIB_COMPILE_RESOURCE) --target $@ $< --generate --c-name kiran
|
||
+$(RESOURCE_XML): data/kiran.css data/icons/close_hover.svg data/icons/close_normal.svg data/icons/close_press.svg
|
||
+ @touch $@
|
||
|
||
gresource.h: $(RESOURCE_XML)
|
||
$(GLIB_COMPILE_RESOURCE) --target $@ $< --generate --c-name kiran
|
||
|
||
-libkiran_la_SOURCES = kiran.c gresource.c gresource.h
|
||
+gresource.c: $(RESOURCE_XML) gresource.h
|
||
+ $(GLIB_COMPILE_RESOURCE) --target $@ $< --generate --c-name kiran
|
||
+
|
||
+kiran.c: gresource.h
|
||
+
|
||
+libkiran_la_SOURCES = kiran.c
|
||
+nodist_libkiran_la_SOURCES=gresource.c
|
||
|
||
libkiran_la_LDFLAGS = -module -avoid-version -no-undefined
|
||
libkiran_la_LIBADD = \
|
||
$(THEME_LIBS) \
|
||
$(NULL)
|
||
|
||
+EXTRA_DIST = data/kiran.css data/icons/close_hover.svg data/icons/close_normal.svg data/icons/close_press.svg $(RESOURCE_XML)
|
||
+
|
||
-include $(top_srcdir)/git.mk
|
||
|
||
-.PHONY :clean
|
||
-clean:
|
||
- rm -f gresource.c gresource.h
|
||
\ No newline at end of file
|
||
+clean-local:
|
||
+ rm -f gresource.h gresource.c
|
||
--
|
||
2.27.0
|
||
|