glsl: Build with subdir-objects.

Apparently $(top_srcdir) is not expanded in a source list when using
subdir-objects, so remove that. It's not clear to me why we were going
to such lengths to prefix each source file anyway.

diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index 1cbc5c6d2c0668982f8c5c332f50c153ddf2f9da..38c2087a493b7658ffd0ac83079b2b7381bc5606 100644 (file)
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -27,7 +27,6 @@ LOCAL_PATH := $(call my-dir)
 
 include $(LOCAL_PATH)/Makefile.sources
 
-GLSL_SRCDIR = .
 # ---------------------------------------
 # Build libmesa_glsl
 # ---------------------------------------

diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index ae2de11de6c0b70b5f2b503234fe6635d5c70c55..3cd8e9ed8842d6ddf8c64ea8e333a0ef2635781a 100644 (file)
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -19,6 +19,8 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src \
@@ -71,10 +73,10 @@ tests_blob_test_LDADD =                                     \
        $(top_builddir)/src/glsl/libglsl.la
 
 tests_general_ir_test_SOURCES =                \
-       $(top_srcdir)/src/mesa/main/imports.c           \
-       $(top_srcdir)/src/mesa/program/prog_hash_table.c\
-       $(top_srcdir)/src/mesa/program/symbol_table.c   \
-       $(GLSL_SRCDIR)/standalone_scaffolding.cpp \
+       ../mesa/main/imports.c                  \
+       ../mesa/program/prog_hash_table.c               \
+       ../mesa/program/symbol_table.c          \
+       standalone_scaffolding.cpp                      \
        tests/builtin_variable_test.cpp                 \
        tests/invalidate_locations_test.cpp             \
        tests/general_ir_test.cpp                       \
@@ -88,9 +90,9 @@ tests_general_ir_test_LDADD =                         \
        $(PTHREAD_LIBS)
 
 tests_uniform_initializer_test_SOURCES =               \
-       $(top_srcdir)/src/mesa/main/imports.c           \
-       $(top_srcdir)/src/mesa/program/prog_hash_table.c\
-       $(top_srcdir)/src/mesa/program/symbol_table.c   \
+       ../mesa/main/imports.c          \
+       ../mesa/program/prog_hash_table.c\
+       ../mesa/program/symbol_table.c  \
        tests/copy_constant_to_storage_tests.cpp        \
        tests/set_uniform_initializer_tests.cpp         \
        tests/uniform_initializer_utils.cpp             \
@@ -104,8 +106,8 @@ tests_uniform_initializer_test_LDADD =                      \
        $(PTHREAD_LIBS)
 
 tests_sampler_types_test_SOURCES =                     \
-       $(top_srcdir)/src/mesa/program/prog_hash_table.c\
-       $(top_srcdir)/src/mesa/program/symbol_table.c   \
+       ../mesa/program/prog_hash_table.c\
+       ../mesa/program/symbol_table.c  \
        tests/sampler_types_test.cpp                    \
        tests/common.c
 tests_sampler_types_test_CFLAGS =                      \
@@ -126,7 +128,7 @@ libglcpp_la_SOURCES =                                       \
 glcpp_glcpp_SOURCES =                                  \
        glcpp/glcpp.c                                   \
        tests/common.c                                  \
-       $(top_srcdir)/src/mesa/program/prog_hash_table.c
+       ../mesa/program/prog_hash_table.c
 glcpp_glcpp_LDADD =                                    \
        libglcpp.la                                     \
        -lm
@@ -140,9 +142,9 @@ libglsl_la_SOURCES =                                        \
        $(NIR_FILES)
 
 glsl_compiler_SOURCES = \
-       $(top_srcdir)/src/mesa/main/imports.c \
-       $(top_srcdir)/src/mesa/program/prog_hash_table.c \
-       $(top_srcdir)/src/mesa/program/symbol_table.c \
+       ../mesa/main/imports.c \
+       ../mesa/program/prog_hash_table.c \
+       ../mesa/program/symbol_table.c \
        $(GLSL_COMPILER_CXX_FILES)
 
 glsl_compiler_LDADD =                                  \
@@ -150,10 +152,10 @@ glsl_compiler_LDADD =                                     \
        $(PTHREAD_LIBS)
 
 glsl_test_SOURCES = \
-       $(top_srcdir)/src/mesa/main/imports.c \
-       $(top_srcdir)/src/mesa/program/prog_hash_table.c \
-       $(top_srcdir)/src/mesa/program/symbol_table.c \
-       $(GLSL_SRCDIR)/standalone_scaffolding.cpp \
+       ../mesa/main/imports.c \
+       ../mesa/program/prog_hash_table.c \
+       ../mesa/program/symbol_table.c \
+       standalone_scaffolding.cpp \
        tests/common.c \
        test.cpp \
        test_optpass.cpp \
@@ -194,14 +196,14 @@ am__v_YACC_0 = @echo "  YACC    " $@;
 am__v_YACC_1 =
 
 glsl_parser.cpp glsl_parser.h: glsl_parser.yy
-       $(AM_V_YACC) $(YACC) $(YFLAGS) -o $@ -p "_mesa_glsl_" --defines=$(GLSL_BUILDDIR)/glsl_parser.h $<
+       $(AM_V_YACC) $(YACC) $(YFLAGS) -o $@ -p "_mesa_glsl_" --defines=$(builddir)/glsl_parser.h $<
 
 glsl_lexer.cpp: glsl_lexer.ll
        $(AM_V_LEX) $(LEX) $(LFLAGS) -o $@ $<
 
 glcpp/glcpp-parse.c glcpp/glcpp-parse.h: glcpp/glcpp-parse.y
        $(AM_V_at)$(MKDIR_P) glcpp
-       $(AM_V_YACC) $(YACC) $(YFLAGS) -o $@ -p "glcpp_parser_" --defines=$(GLSL_BUILDDIR)/glcpp/glcpp-parse.h $<
+       $(AM_V_YACC) $(YACC) $(YFLAGS) -o $@ -p "glcpp_parser_" --defines=$(builddir)/glcpp/glcpp-parse.h $<
 
 glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
        $(AM_V_at)$(MKDIR_P) glcpp

diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index fde0f8a7205efa18dc2ee41eda1359ad087d05eb..5d476a1bb6d959b93294e6e26162506317b782bc 100644 (file)
--- a/src/glsl/Makefile.sources
+++ b/src/glsl/Makefile.sources
@@ -1,193 +1,190 @@
 # shared source lists for Makefile, SConscript, and Android.mk
 
-GLSL_SRCDIR = $(top_srcdir)/src/glsl
-GLSL_BUILDDIR = $(top_builddir)/src/glsl
-
 # libglcpp
 
 LIBGLCPP_FILES = \
-       $(GLSL_SRCDIR)/glcpp/glcpp.h \
-       $(GLSL_SRCDIR)/glcpp/pp.c
+       glcpp/glcpp.h \
+       glcpp/pp.c
 
 LIBGLCPP_GENERATED_FILES = \
-       $(GLSL_BUILDDIR)/glcpp/glcpp-lex.c \
-       $(GLSL_BUILDDIR)/glcpp/glcpp-parse.c
+       glcpp/glcpp-lex.c \
+       glcpp/glcpp-parse.c
 
 NIR_GENERATED_FILES = \
-       $(GLSL_BUILDDIR)/nir/nir_opt_algebraic.c
+       nir/nir_opt_algebraic.c
 
 NIR_FILES = \
-       $(GLSL_SRCDIR)/nir/nir.c \
-       $(GLSL_SRCDIR)/nir/nir.h \
-       $(GLSL_SRCDIR)/nir/nir_dominance.c \
-       $(GLSL_SRCDIR)/nir/nir_from_ssa.c \
-       $(GLSL_SRCDIR)/nir/nir_intrinsics.c \
-       $(GLSL_SRCDIR)/nir/nir_intrinsics.h \
-       $(GLSL_SRCDIR)/nir/nir_live_variables.c \
-       $(GLSL_SRCDIR)/nir/nir_lower_atomics.c \
-       $(GLSL_SRCDIR)/nir/nir_lower_global_vars_to_local.c \
-       $(GLSL_SRCDIR)/nir/nir_lower_locals_to_regs.c \
-       $(GLSL_SRCDIR)/nir/nir_lower_io.c \
-       $(GLSL_SRCDIR)/nir/nir_lower_samplers.cpp \
-       $(GLSL_SRCDIR)/nir/nir_lower_system_values.c \
-       $(GLSL_SRCDIR)/nir/nir_lower_to_source_mods.c \
-       $(GLSL_SRCDIR)/nir/nir_lower_vars_to_ssa.c \
-       $(GLSL_SRCDIR)/nir/nir_lower_var_copies.c \
-       $(GLSL_SRCDIR)/nir/nir_lower_vec_to_movs.c \
-       $(GLSL_SRCDIR)/nir/nir_metadata.c \
-       $(GLSL_SRCDIR)/nir/nir_opcodes.c \
-       $(GLSL_SRCDIR)/nir/nir_opcodes.h \
-       $(GLSL_SRCDIR)/nir/nir_opt_constant_folding.c \
-       $(GLSL_SRCDIR)/nir/nir_opt_copy_propagate.c \
-       $(GLSL_SRCDIR)/nir/nir_opt_cse.c \
-       $(GLSL_SRCDIR)/nir/nir_opt_dce.c \
-       $(GLSL_SRCDIR)/nir/nir_opt_global_to_local.c \
-       $(GLSL_SRCDIR)/nir/nir_opt_peephole_select.c \
-       $(GLSL_SRCDIR)/nir/nir_print.c \
-       $(GLSL_SRCDIR)/nir/nir_remove_dead_variables.c \
-       $(GLSL_SRCDIR)/nir/nir_search.c \
-       $(GLSL_SRCDIR)/nir/nir_search.h \
-       $(GLSL_SRCDIR)/nir/nir_split_var_copies.c \
-       $(GLSL_SRCDIR)/nir/nir_to_ssa.c \
-       $(GLSL_SRCDIR)/nir/nir_types.h \
-       $(GLSL_SRCDIR)/nir/nir_validate.c \
-       $(GLSL_SRCDIR)/nir/nir_worklist.c \
-       $(GLSL_SRCDIR)/nir/nir_worklist.h \
-       $(GLSL_SRCDIR)/nir/nir_types.cpp \
-       $(GLSL_SRCDIR)/nir/glsl_to_nir.cpp \
-       $(GLSL_SRCDIR)/nir/glsl_to_nir.h \
+       nir/glsl_to_nir.cpp \
+       nir/glsl_to_nir.h \
+       nir/nir.c \
+       nir/nir.h \
+       nir/nir_dominance.c \
+       nir/nir_from_ssa.c \
+       nir/nir_intrinsics.c \
+       nir/nir_intrinsics.h \
+       nir/nir_live_variables.c \
+       nir/nir_lower_atomics.c \
+       nir/nir_lower_global_vars_to_local.c \
+       nir/nir_lower_locals_to_regs.c \
+       nir/nir_lower_io.c \
+       nir/nir_lower_samplers.cpp \
+       nir/nir_lower_system_values.c \
+       nir/nir_lower_to_source_mods.c \
+       nir/nir_lower_vars_to_ssa.c \
+       nir/nir_lower_var_copies.c \
+       nir/nir_lower_vec_to_movs.c \
+       nir/nir_metadata.c \
+       nir/nir_opcodes.c \
+       nir/nir_opcodes.h \
+       nir/nir_opt_constant_folding.c \
+       nir/nir_opt_copy_propagate.c \
+       nir/nir_opt_cse.c \
+       nir/nir_opt_dce.c \
+       nir/nir_opt_global_to_local.c \
+       nir/nir_opt_peephole_select.c \
+       nir/nir_print.c \
+       nir/nir_remove_dead_variables.c \
+       nir/nir_search.c \
+       nir/nir_search.h \
+       nir/nir_split_var_copies.c \
+       nir/nir_to_ssa.c \
+       nir/nir_types.h \
+       nir/nir_validate.c \
+       nir/nir_worklist.c \
+       nir/nir_worklist.h \
+       nir/nir_types.cpp \
        $(NIR_GENERATED_FILES)
 
 # libglsl
 
 LIBGLSL_FILES = \
-       $(GLSL_SRCDIR)/ast.h \
-       $(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)/blob.c \
-       $(GLSL_SRCDIR)/blob.h \
-       $(GLSL_SRCDIR)/builtin_functions.cpp \
-       $(GLSL_SRCDIR)/builtin_type_macros.h \
-       $(GLSL_SRCDIR)/builtin_types.cpp \
-       $(GLSL_SRCDIR)/builtin_variables.cpp \
-       $(GLSL_SRCDIR)/glsl_parser_extras.cpp \
-       $(GLSL_SRCDIR)/glsl_parser_extras.h \
-       $(GLSL_SRCDIR)/glsl_symbol_table.cpp \
-       $(GLSL_SRCDIR)/glsl_symbol_table.h \
-       $(GLSL_SRCDIR)/glsl_types.cpp \
-       $(GLSL_SRCDIR)/glsl_types.h \
-       $(GLSL_SRCDIR)/hir_field_selection.cpp \
-       $(GLSL_SRCDIR)/ir_basic_block.cpp \
-       $(GLSL_SRCDIR)/ir_basic_block.h \
-       $(GLSL_SRCDIR)/ir_builder.cpp \
-       $(GLSL_SRCDIR)/ir_builder.h \
-       $(GLSL_SRCDIR)/ir_clone.cpp \
-       $(GLSL_SRCDIR)/ir_constant_expression.cpp \
-       $(GLSL_SRCDIR)/ir.cpp \
-       $(GLSL_SRCDIR)/ir.h \
-       $(GLSL_SRCDIR)/ir_equals.cpp \
-       $(GLSL_SRCDIR)/ir_expression_flattening.cpp \
-       $(GLSL_SRCDIR)/ir_expression_flattening.h \
-       $(GLSL_SRCDIR)/ir_function_can_inline.cpp \
-       $(GLSL_SRCDIR)/ir_function_detect_recursion.cpp \
-       $(GLSL_SRCDIR)/ir_function_inlining.h \
-       $(GLSL_SRCDIR)/ir_function.cpp \
-       $(GLSL_SRCDIR)/ir_hierarchical_visitor.cpp \
-       $(GLSL_SRCDIR)/ir_hierarchical_visitor.h \
-       $(GLSL_SRCDIR)/ir_hv_accept.cpp \
-       $(GLSL_SRCDIR)/ir_import_prototypes.cpp \
-       $(GLSL_SRCDIR)/ir_optimization.h \
-       $(GLSL_SRCDIR)/ir_print_visitor.cpp \
-       $(GLSL_SRCDIR)/ir_print_visitor.h \
-       $(GLSL_SRCDIR)/ir_reader.cpp \
-       $(GLSL_SRCDIR)/ir_reader.h \
-       $(GLSL_SRCDIR)/ir_rvalue_visitor.cpp \
-       $(GLSL_SRCDIR)/ir_rvalue_visitor.h \
-       $(GLSL_SRCDIR)/ir_set_program_inouts.cpp \
-       $(GLSL_SRCDIR)/ir_uniform.h \
-       $(GLSL_SRCDIR)/ir_validate.cpp \
-       $(GLSL_SRCDIR)/ir_variable_refcount.cpp \
-       $(GLSL_SRCDIR)/ir_variable_refcount.h \
-       $(GLSL_SRCDIR)/ir_visitor.h \
-       $(GLSL_SRCDIR)/linker.cpp \
-       $(GLSL_SRCDIR)/linker.h \
-       $(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_block_active_visitor.h \
-       $(GLSL_SRCDIR)/link_uniform_blocks.cpp \
-       $(GLSL_SRCDIR)/link_varyings.cpp \
-       $(GLSL_SRCDIR)/link_varyings.h \
-       $(GLSL_SRCDIR)/list.h \
-       $(GLSL_SRCDIR)/loop_analysis.cpp \
-       $(GLSL_SRCDIR)/loop_analysis.h \
-       $(GLSL_SRCDIR)/loop_controls.cpp \
-       $(GLSL_SRCDIR)/loop_unroll.cpp \
-       $(GLSL_SRCDIR)/lower_clip_distance.cpp \
-       $(GLSL_SRCDIR)/lower_const_arrays_to_uniforms.cpp \
-       $(GLSL_SRCDIR)/lower_discard.cpp \
-       $(GLSL_SRCDIR)/lower_discard_flow.cpp \
-       $(GLSL_SRCDIR)/lower_if_to_cond_assign.cpp \
-       $(GLSL_SRCDIR)/lower_instructions.cpp \
-       $(GLSL_SRCDIR)/lower_jumps.cpp \
-       $(GLSL_SRCDIR)/lower_mat_op_to_vec.cpp \
-       $(GLSL_SRCDIR)/lower_noise.cpp \
-       $(GLSL_SRCDIR)/lower_offset_array.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_vertex_id.cpp \
-       $(GLSL_SRCDIR)/lower_output_reads.cpp \
-       $(GLSL_SRCDIR)/lower_ubo_reference.cpp \
-       $(GLSL_SRCDIR)/opt_algebraic.cpp \
-       $(GLSL_SRCDIR)/opt_array_splitting.cpp \
-       $(GLSL_SRCDIR)/opt_constant_folding.cpp \
-       $(GLSL_SRCDIR)/opt_constant_propagation.cpp \
-       $(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_variables.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_minmax.cpp \
-       $(GLSL_SRCDIR)/opt_noop_swizzle.cpp \
-       $(GLSL_SRCDIR)/opt_rebalance_tree.cpp \
-       $(GLSL_SRCDIR)/opt_redundant_jumps.cpp \
-       $(GLSL_SRCDIR)/opt_structure_splitting.cpp \
-       $(GLSL_SRCDIR)/opt_swizzle_swizzle.cpp \
-       $(GLSL_SRCDIR)/opt_tree_grafting.cpp \
-       $(GLSL_SRCDIR)/opt_vectorize.cpp \
-       $(GLSL_SRCDIR)/program.h \
-       $(GLSL_SRCDIR)/s_expression.cpp \
-       $(GLSL_SRCDIR)/s_expression.h
+       ast.h \
+       ast_array_index.cpp \
+       ast_expr.cpp \
+       ast_function.cpp \
+       ast_to_hir.cpp \
+       ast_type.cpp \
+       blob.c \
+       blob.h \
+       builtin_functions.cpp \
+       builtin_type_macros.h \
+       builtin_types.cpp \
+       builtin_variables.cpp \
+       glsl_parser_extras.cpp \
+       glsl_parser_extras.h \
+       glsl_symbol_table.cpp \
+       glsl_symbol_table.h \
+       glsl_types.cpp \
+       glsl_types.h \
+       hir_field_selection.cpp \
+       ir_basic_block.cpp \
+       ir_basic_block.h \
+       ir_builder.cpp \
+       ir_builder.h \
+       ir_clone.cpp \
+       ir_constant_expression.cpp \
+       ir.cpp \
+       ir.h \
+       ir_equals.cpp \
+       ir_expression_flattening.cpp \
+       ir_expression_flattening.h \
+       ir_function_can_inline.cpp \
+       ir_function_detect_recursion.cpp \
+       ir_function_inlining.h \
+       ir_function.cpp \
+       ir_hierarchical_visitor.cpp \
+       ir_hierarchical_visitor.h \
+       ir_hv_accept.cpp \
+       ir_import_prototypes.cpp \
+       ir_optimization.h \
+       ir_print_visitor.cpp \
+       ir_print_visitor.h \
+       ir_reader.cpp \
+       ir_reader.h \
+       ir_rvalue_visitor.cpp \
+       ir_rvalue_visitor.h \
+       ir_set_program_inouts.cpp \
+       ir_uniform.h \
+       ir_validate.cpp \
+       ir_variable_refcount.cpp \
+       ir_variable_refcount.h \
+       ir_visitor.h \
+       linker.cpp \
+       linker.h \
+       link_atomics.cpp \
+       link_functions.cpp \
+       link_interface_blocks.cpp \
+       link_uniforms.cpp \
+       link_uniform_initializers.cpp \
+       link_uniform_block_active_visitor.cpp \
+       link_uniform_block_active_visitor.h \
+       link_uniform_blocks.cpp \
+       link_varyings.cpp \
+       link_varyings.h \
+       list.h \
+       loop_analysis.cpp \
+       loop_analysis.h \
+       loop_controls.cpp \
+       loop_unroll.cpp \
+       lower_clip_distance.cpp \
+       lower_const_arrays_to_uniforms.cpp \
+       lower_discard.cpp \
+       lower_discard_flow.cpp \
+       lower_if_to_cond_assign.cpp \
+       lower_instructions.cpp \
+       lower_jumps.cpp \
+       lower_mat_op_to_vec.cpp \
+       lower_noise.cpp \
+       lower_offset_array.cpp \
+       lower_packed_varyings.cpp \
+       lower_named_interface_blocks.cpp \
+       lower_packing_builtins.cpp \
+       lower_texture_projection.cpp \
+       lower_variable_index_to_cond_assign.cpp \
+       lower_vec_index_to_cond_assign.cpp \
+       lower_vec_index_to_swizzle.cpp \
+       lower_vector.cpp \
+       lower_vector_insert.cpp \
+       lower_vertex_id.cpp \
+       lower_output_reads.cpp \
+       lower_ubo_reference.cpp \
+       opt_algebraic.cpp \
+       opt_array_splitting.cpp \
+       opt_constant_folding.cpp \
+       opt_constant_propagation.cpp \
+       opt_constant_variable.cpp \
+       opt_copy_propagation.cpp \
+       opt_copy_propagation_elements.cpp \
+       opt_cse.cpp \
+       opt_dead_builtin_variables.cpp \
+       opt_dead_builtin_varyings.cpp \
+       opt_dead_code.cpp \
+       opt_dead_code_local.cpp \
+       opt_dead_functions.cpp \
+       opt_flatten_nested_if_blocks.cpp \
+       opt_flip_matrices.cpp \
+       opt_function_inlining.cpp \
+       opt_if_simplification.cpp \
+       opt_minmax.cpp \
+       opt_noop_swizzle.cpp \
+       opt_rebalance_tree.cpp \
+       opt_redundant_jumps.cpp \
+       opt_structure_splitting.cpp \
+       opt_swizzle_swizzle.cpp \
+       opt_tree_grafting.cpp \
+       opt_vectorize.cpp \
+       program.h \
+       s_expression.cpp \
+       s_expression.h
 
 # glsl_compiler
 
 GLSL_COMPILER_CXX_FILES = \
-       $(GLSL_SRCDIR)/standalone_scaffolding.cpp \
-       $(GLSL_SRCDIR)/standalone_scaffolding.h \
-       $(GLSL_SRCDIR)/main.cpp
+       standalone_scaffolding.cpp \
+       standalone_scaffolding.h \
+       main.cpp
 
 # libglsl generated sources
 LIBGLSL_GENERATED_CXX_FILES = \
-       $(GLSL_BUILDDIR)/glsl_lexer.cpp \
-       $(GLSL_BUILDDIR)/glsl_parser.cpp
+       glsl_lexer.cpp \
+       glsl_parser.cpp