From 50056d804b9bfa5cbea6e5f7a6a8a5cccd753a33 Mon Sep 17 00:00:00 2001 From: Juan Pablo Ugarte Date: Fri, 28 Oct 2016 17:30:46 -0300 Subject: [PATCH] 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 file 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 "" > $@; \ echo "" >> $@; \ echo " " >> $@; \ - for f in $(srcdir)/resources/glsl/*.glsl; do \ + for f in $(glsl_sources); do \ n=`basename $$f`; \ echo " resources/glsl/$$n" >> $@; \ done; \ echo " " >> $@; \ echo "" >> $@; -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