diff options
| author | Rob Clark <[email protected]> | 2015-10-17 09:49:19 -0400 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2015-10-17 09:51:29 -0400 |
| commit | 7e6aafd6ab89ad8bc113f67eb666a90b979cdb8e (patch) | |
| tree | d8e10fc7197eb13449c73bc45ddfda45542535ab | |
| parent | b7963b6926c06666b24453344c47f12e369e8fd1 (diff) | |
build: fix make-check after a6a6a71
commit a6a6a71092ba912803ae2b47eb56e3afdf36feb5
Author: Rob Clark <[email protected]>
AuthorDate: Sat Oct 10 14:13:50 2015 -0400
glsl: (mostly) remove libglsl_util
Was a bit too ambitious on removal of libglsl_util.. it is still needed
by some of the tests.
Signed-off-by: Rob Clark <[email protected]>
| -rw-r--r-- | src/glsl/Makefile.am | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am index ebea816b96d..33a34e4ccc8 100644 --- a/src/glsl/Makefile.am +++ b/src/glsl/Makefile.am @@ -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 @@ -164,6 +168,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, |