[gtk+] build: List resource files explicitly
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] build: List resource files explicitly
- Date: Wed, 11 Jan 2017 17:36:50 +0000 (UTC)
commit 10bc71a5e6bcd2f214230b670e4505ce4a2f2306
Author: Benjamin Otte <otte redhat com>
Date: Wed Jan 11 15:17:49 2017 +0100
build: List resource files explicitly
This way, we ensure that files that are built during make always get
properly listed. And we ensure that creating the resources actually
depends on them.
gsk/Makefile.am | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gsk/Makefile.am b/gsk/Makefile.am
index e74529c..d665e1d 100644
--- a/gsk/Makefile.am
+++ b/gsk/Makefile.am
@@ -172,7 +172,10 @@ gskenumtypes.c: $(gsk_public_source_h) gskenumtypes.c.template
EXTRA_DIST += gskenumtypes.h.template gskenumtypes.c.template
DISTCLEANFILES += gskenumtypes.h gskenumtypes.c
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies
$(builddir)/gsk.resources.xml)
+resource_files = \
+ $(gsk_private_source_shaders) \
+ $(gsk_private_vulkan_compiled_shaders) \
+ $(gsk_private_vulkan_shaders)
resources/vulkan/%.frag.spv: resources/vulkan/%.frag.glsl
@if test -z "$(GLSLC)"; then echo "Missing glslc. See https://github.com/google/shaderc"; exit 1; fi
@@ -201,7 +204,7 @@ gsk.resources.xml: Makefile.am
echo " </gresource>" >> $@; \
echo "</gresources>" >> $@
-gskresources.h: gsk.resources.xml
+gskresources.h: gsk.resources.xml $(resource_files)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
--target=$@ --sourcedir=$(srcdir) --c-name _gsk --generate-header --manual-register
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]