nir/print: Factor variable name lookup into a helper

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

diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index ebea816b96df6c8cf5f044939485d4c5f942682a..8b0a73b250a768aa48bf40c622e85643a27efb18 100644 (file)
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -78,7 +78,7 @@ check_PROGRAMS =                                      \
        tests/sampler-types-test                        \
        tests/uniform-initializer-test
 
-noinst_PROGRAMS = glsl_compiler
+noinst_PROGRAMS = glsl_compiler spirv2nir
 
 tests_blob_test_SOURCES =                              \
        tests/blob_test.c
@@ -96,6 +96,7 @@ tests_general_ir_test_CFLAGS =                                \
 tests_general_ir_test_LDADD =                          \
        $(top_builddir)/src/gtest/libgtest.la           \
        $(top_builddir)/src/glsl/libglsl.la             \
+       $(top_builddir)/src/libglsl_util.la             \
        $(PTHREAD_LIBS)
 
 tests_uniform_initializer_test_SOURCES =               \
@@ -108,6 +109,7 @@ tests_uniform_initializer_test_CFLAGS =                     \
 tests_uniform_initializer_test_LDADD =                 \
        $(top_builddir)/src/gtest/libgtest.la           \
        $(top_builddir)/src/glsl/libglsl.la             \
+       $(top_builddir)/src/libglsl_util.la             \
        $(PTHREAD_LIBS)
 
 tests_sampler_types_test_SOURCES =                     \
@@ -117,6 +119,7 @@ tests_sampler_types_test_CFLAGS =                   \
 tests_sampler_types_test_LDADD =                       \
        $(top_builddir)/src/gtest/libgtest.la           \
        $(top_builddir)/src/glsl/libglsl.la             \
+       $(top_builddir)/src/libglsl_util.la             \
        $(PTHREAD_LIBS)
 
 libglcpp_la_LIBADD =                                   \
@@ -131,6 +134,7 @@ glcpp_glcpp_SOURCES =                                       \
        glcpp/glcpp.c
 glcpp_glcpp_LDADD =                                    \
        libglcpp.la                                     \
+       $(top_builddir)/src/libglsl_util.la             \
        -lm
 
 libglsl_la_LIBADD = libglcpp.la
@@ -156,6 +160,16 @@ glsl_compiler_LDADD =                                      \
        $(top_builddir)/src/util/libmesautil.la         \
        $(PTHREAD_LIBS)
 
+spirv2nir_SOURCES = \
+       standalone_scaffolding.cpp \
+       standalone_scaffolding.h \
+       nir/spirv2nir.c
+
+spirv2nir_LDADD =                                      \
+       libglsl.la                                      \
+       $(top_builddir)/src/libglsl_util.la             \
+       $(PTHREAD_LIBS)
+
 glsl_test_SOURCES = \
        standalone_scaffolding.cpp \
        test.cpp \
@@ -164,6 +178,7 @@ glsl_test_SOURCES = \
 
 glsl_test_LDADD =                                      \
        libglsl.la                                      \
+       $(top_builddir)/src/libglsl_util.la             \
        $(PTHREAD_LIBS)
 
 # We write our own rules for yacc and lex below. We'd rather use automake,