Fix 'make check' in src/mapi/glapi/tests when builddir != srcdir

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

diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index 765f06a27cbb8b23e222e82f7e33f9a139a8120f..2e81deddabb9c79ee4a6a0ff78f38c14cdacab38 100644 (file)
--- a/src/glsl/Makefile.sources
+++ b/src/glsl/Makefile.sources
@@ -1,27 +1,28 @@
 # shared source lists for Makefile, SConscript, and Android.mk
 
-GLSL_SRCDIR ?= .
+GLSL_SRCDIR = $(top_srcdir)/src/glsl
+GLSL_BUILDDIR = $(top_builddir)/src/glsl
 
 # libglcpp
 
 LIBGLCPP_FILES = \
+       $(GLSL_SRCDIR)/ralloc.c \
        $(GLSL_SRCDIR)/glcpp/pp.c
 
 LIBGLCPP_GENERATED_FILES = \
-       $(GLSL_SRCDIR)/glcpp/glcpp-lex.c \
-       $(GLSL_SRCDIR)/glcpp/glcpp-parse.c
+       $(GLSL_BUILDDIR)/glcpp/glcpp-lex.c \
+       $(GLSL_BUILDDIR)/glcpp/glcpp-parse.c
 
 # libglsl
 
 LIBGLSL_FILES = \
-       $(GLSL_SRCDIR)/strtod.c \
-       $(GLSL_SRCDIR)/ralloc.c
-
-LIBGLSL_CXX_FILES = \
+       $(GLSL_SRCDIR)/ast_array_index.cpp \
        $(GLSL_SRCDIR)/ast_expr.cpp \
        $(GLSL_SRCDIR)/ast_function.cpp \
        $(GLSL_SRCDIR)/ast_to_hir.cpp \
        $(GLSL_SRCDIR)/ast_type.cpp \
+       $(GLSL_SRCDIR)/builtin_functions.cpp \
+       $(GLSL_SRCDIR)/builtin_types.cpp \
        $(GLSL_SRCDIR)/builtin_variables.cpp \
        $(GLSL_SRCDIR)/glsl_parser_extras.cpp \
        $(GLSL_SRCDIR)/glsl_types.cpp \
@@ -32,6 +33,7 @@ LIBGLSL_CXX_FILES = \
        $(GLSL_SRCDIR)/ir_clone.cpp \
        $(GLSL_SRCDIR)/ir_constant_expression.cpp \
        $(GLSL_SRCDIR)/ir.cpp \
+       $(GLSL_SRCDIR)/ir_equals.cpp \
        $(GLSL_SRCDIR)/ir_expression_flattening.cpp \
        $(GLSL_SRCDIR)/ir_function_can_inline.cpp \
        $(GLSL_SRCDIR)/ir_function_detect_recursion.cpp \
@@ -46,9 +48,14 @@ LIBGLSL_CXX_FILES = \
        $(GLSL_SRCDIR)/ir_validate.cpp \
        $(GLSL_SRCDIR)/ir_variable_refcount.cpp \
        $(GLSL_SRCDIR)/linker.cpp \
+       $(GLSL_SRCDIR)/link_atomics.cpp \
        $(GLSL_SRCDIR)/link_functions.cpp \
+       $(GLSL_SRCDIR)/link_interface_blocks.cpp \
        $(GLSL_SRCDIR)/link_uniforms.cpp \
        $(GLSL_SRCDIR)/link_uniform_initializers.cpp \
+       $(GLSL_SRCDIR)/link_uniform_block_active_visitor.cpp \
+       $(GLSL_SRCDIR)/link_uniform_blocks.cpp \
+       $(GLSL_SRCDIR)/link_varyings.cpp \
        $(GLSL_SRCDIR)/loop_analysis.cpp \
        $(GLSL_SRCDIR)/loop_controls.cpp \
        $(GLSL_SRCDIR)/loop_unroll.cpp \
@@ -60,11 +67,15 @@ LIBGLSL_CXX_FILES = \
        $(GLSL_SRCDIR)/lower_jumps.cpp \
        $(GLSL_SRCDIR)/lower_mat_op_to_vec.cpp \
        $(GLSL_SRCDIR)/lower_noise.cpp \
+       $(GLSL_SRCDIR)/lower_packed_varyings.cpp \
+       $(GLSL_SRCDIR)/lower_named_interface_blocks.cpp \
+       $(GLSL_SRCDIR)/lower_packing_builtins.cpp \
        $(GLSL_SRCDIR)/lower_texture_projection.cpp \
        $(GLSL_SRCDIR)/lower_variable_index_to_cond_assign.cpp \
        $(GLSL_SRCDIR)/lower_vec_index_to_cond_assign.cpp \
        $(GLSL_SRCDIR)/lower_vec_index_to_swizzle.cpp \
        $(GLSL_SRCDIR)/lower_vector.cpp \
+       $(GLSL_SRCDIR)/lower_vector_insert.cpp \
        $(GLSL_SRCDIR)/lower_output_reads.cpp \
        $(GLSL_SRCDIR)/lower_ubo_reference.cpp \
        $(GLSL_SRCDIR)/opt_algebraic.cpp \
@@ -74,9 +85,13 @@ LIBGLSL_CXX_FILES = \
        $(GLSL_SRCDIR)/opt_constant_variable.cpp \
        $(GLSL_SRCDIR)/opt_copy_propagation.cpp \
        $(GLSL_SRCDIR)/opt_copy_propagation_elements.cpp \
+       $(GLSL_SRCDIR)/opt_cse.cpp \
+       $(GLSL_SRCDIR)/opt_dead_builtin_varyings.cpp \
        $(GLSL_SRCDIR)/opt_dead_code.cpp \
        $(GLSL_SRCDIR)/opt_dead_code_local.cpp \
        $(GLSL_SRCDIR)/opt_dead_functions.cpp \
+       $(GLSL_SRCDIR)/opt_flatten_nested_if_blocks.cpp \
+       $(GLSL_SRCDIR)/opt_flip_matrices.cpp \
        $(GLSL_SRCDIR)/opt_function_inlining.cpp \
        $(GLSL_SRCDIR)/opt_if_simplification.cpp \
        $(GLSL_SRCDIR)/opt_noop_swizzle.cpp \
@@ -84,7 +99,8 @@ LIBGLSL_CXX_FILES = \
        $(GLSL_SRCDIR)/opt_structure_splitting.cpp \
        $(GLSL_SRCDIR)/opt_swizzle_swizzle.cpp \
        $(GLSL_SRCDIR)/opt_tree_grafting.cpp \
-       $(GLSL_SRCDIR)/s_expression.cpp
+       $(GLSL_SRCDIR)/s_expression.cpp \
+       $(GLSL_SRCDIR)/strtod.c
 
 # glsl_compiler
 
@@ -92,20 +108,7 @@ GLSL_COMPILER_CXX_FILES = \
        $(GLSL_SRCDIR)/standalone_scaffolding.cpp \
        $(GLSL_SRCDIR)/main.cpp
 
-# builtin_compiler
-#
-# This is built before libglsl to generate builtin_funciton.cpp for libglsl.
-# For this to work, a dummy version of builtin_function.cpp,
-# builtin_stubs.cpp, is used.
-
-BUILTIN_COMPILER_CXX_FILES = \
-       $(GLSL_SRCDIR)/builtin_stubs.cpp
-
-BUILTIN_COMPILER_GENERATED_CXX_FILES = \
-       $(GLSL_SRCDIR)/glsl_lexer.cc \
-       $(GLSL_SRCDIR)/glsl_parser.cc
-
 # libglsl generated sources
 LIBGLSL_GENERATED_CXX_FILES = \
-       $(GLSL_SRCDIR)/$(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
-       $(GLSL_SRCDIR)/builtin_function.cpp
+       $(GLSL_BUILDDIR)/glsl_lexer.cpp \
+       $(GLSL_BUILDDIR)/glsl_parser.cpp