[gtk+/gtk-3-22] gdk/Makefile.am: fixed glsl resources extra dist files.



commit 28ce953caac7175aae666cd88e0319fe0b31979c
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 052d487..35dc661 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -459,29 +459,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]