diff options
| author | Juan Pablo Ugarte <ugarte@endlessm.com> | 2016-10-28 17:30:46 -0300 |
|---|---|---|
| committer | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2016-10-31 10:15:05 -0300 |
| commit | 50056d804b9bfa5cbea6e5f7a6a8a5cccd753a33 (patch) | |
| tree | d5cb092a22e99bf7f4ead96ad6b10ff90306c768 | |
| parent | d7df4916560e39664f227d6b0e67d422f44b5c4c (diff) | |
| download | gtk+-50056d804b9bfa5cbea6e5f7a6a8a5cccd753a33.tar.gz | |
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.
| -rw-r--r-- | gdk/Makefile.am | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/gdk/Makefile.am b/gdk/Makefile.am index e17047c101..8553d13c09 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 |