[gtk+] gdk/Makefile.am: fixed glsl resources extra dist files.
- From: Juan Pablo Ugarte <jpu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gdk/Makefile.am: fixed glsl resources extra dist files.
- Date: Mon, 31 Oct 2016 13:18:38 +0000 (UTC)
commit 50056d804b9bfa5cbea6e5f7a6a8a5cccd753a33
Author: Juan Pablo Ugarte <ugarte endlessm com>
Date: Fri Oct 28 17:30:46 2016 -0300
gdk/Makefile.am: fixed glsl resources extra dist files.
Use the same wildcard partern used to generate gdk.gresource.xml to include files in EXTRA_DIST var.
gdk/Makefile.am | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index e17047c..8553d13 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -444,29 +444,20 @@ stamp-gc-h: $(top_builddir)/config.status
#
# Resources
#
+
+glsl_sources := $(wildcard $(srcdir)/resources/glsl/*.glsl)
+
gdk.gresource.xml: Makefile.am
$(AM_V_GEN) echo "<?xml version='1.0' encoding='UTF-8'?>" > $@; \
echo "<gresources>" >> $@; \
echo " <gresource prefix='/org/gtk/libgdk'>" >> $@; \
- for f in $(srcdir)/resources/glsl/*.glsl; do \
+ for f in $(glsl_sources); do \
n=`basename $$f`; \
echo " <file alias='glsl/$$n'>resources/glsl/$$n</file>" >> $@; \
done; \
echo " </gresource>" >> $@; \
echo "</gresources>" >> $@;
-glsl_sources = \
- resources/glsl/gl3-texture-2d.fs.glsl \
- resources/glsl/gl3-texture-2d.vs.glsl \
- resources/glsl/gl3-texture-rect.fs.glsl \
- resources/glsl/gl3-texture-rect.vs.glsl \
- resources/glsl/gl2-texture-2d.fs.glsl \
- resources/glsl/gl2-texture-2d.fs.glsl \
- resources/glsl/gl2-texture-rect.vs.glsl \
- resources/glsl/gl2-texture-rect.vs.glsl \
- resources/glsl/gles2-texture.fs.glsl \
- resources/glsl/gles2-texture.vs.glsl
-
EXTRA_DIST += $(glsl_sources)
CLEANFILES += gdk.gresource.xml
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]