glsl: Add utility to convert text files to C strings

[mesa.git] / src / compiler / Makefile.glsl.am

diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am
index d6b034ee6cc885acfa7a547cb3ed9c278b622539..9d88d1f66eed1985f52c4e71959f46e8347cc6b5 100644 (file)
--- a/src/compiler/Makefile.glsl.am
+++ b/src/compiler/Makefile.glsl.am
@@ -28,10 +28,10 @@ EXTRA_DIST += glsl/tests glsl/glcpp/tests glsl/README       \
        glsl/ir_expression_operation.py                 \
        glsl/glcpp/glcpp-lex.l                          \
        glsl/glcpp/glcpp-parse.y                        \
+       glsl/xxd.py                                     \
        SConscript.glsl
 
 TESTS += glsl/glcpp/tests/glcpp-test.sh                        \
-       glsl/glcpp/tests/glcpp-test-cr-lf.sh            \
        glsl/tests/blob-test                            \
        glsl/tests/cache-test                           \
        glsl/tests/general-ir-test                      \
@@ -41,7 +41,8 @@ TESTS += glsl/glcpp/tests/glcpp-test.sh                       \
        glsl/tests/warnings-test.sh
 
 TESTS_ENVIRONMENT= \
-       export PYTHON2=$(PYTHON2); \
+       export abs_builddir=$(abs_builddir); \
+       export PYTHON=$(PYTHON); \
        export PYTHON_FLAGS=$(PYTHON_FLAGS);
 
 check_PROGRAMS +=                                      \
@@ -53,7 +54,7 @@ check_PROGRAMS +=                                     \
        glsl/tests/sampler-types-test                   \
        glsl/tests/uniform-initializer-test
 
-noinst_PROGRAMS = glsl_compiler
+noinst_PROGRAMS += glsl_compiler
 
 glsl_tests_blob_test_SOURCES =                         \
        glsl/tests/blob_test.c