diff options
| author | Ian Romanick <[email protected]> | 2011-03-01 15:45:43 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2011-03-01 15:57:32 -0800 |
| commit | 3ff4974f225a844625cf47c9b1a7d53c3cd7b2c1 (patch) | |
| tree | e9792c8271839120c3680e0d73b0356469a52d0d /src | |
| parent | 30600e3dabd5055a838ddfbf0c3fe6b0eac83979 (diff) | |
mesa: Revert most of 3158cc7d because it causes other breakage
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/sources.mak | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak index 35eaeb74f14..ae92e4da940 100644 --- a/src/mesa/sources.mak +++ b/src/mesa/sources.mak @@ -234,9 +234,11 @@ STATETRACKER_SOURCES = \ PROGRAM_SOURCES = \ program/arbprogparse.c \ program/hash_table.c \ + program/lex.yy.c \ program/nvfragparse.c \ program/nvvertparse.c \ program/program.c \ + program/program_parse.tab.c \ program/program_parse_extra.c \ program/prog_cache.c \ program/prog_execute.c \ @@ -252,9 +254,6 @@ PROGRAM_SOURCES = \ program/register_allocate.c \ program/symbol_table.c -PROGRAM_GENERATED_SOURCES = \ - program/lex.yy.c \ - program/program_parse.tab.c SHADER_CXX_SOURCES = \ program/ir_to_mesa.cpp \ @@ -303,7 +302,7 @@ COMMON_DRIVER_SOURCES = \ # Sources for building non-Gallium drivers -MESA_SOURCES_FOR_DEPEND = \ +MESA_SOURCES = \ $(MAIN_SOURCES) \ $(MATH_SOURCES) \ $(MATH_XFORM_SOURCES) \ @@ -315,10 +314,6 @@ MESA_SOURCES_FOR_DEPEND = \ $(COMMON_DRIVER_SOURCES)\ $(ASM_C_SOURCES) -MESA_SOURCES = \ - $(MESA_SOURCES_FOR_DEPEND) \ - $(PROGRAM_GENERATED_SOURCES) - MESA_CXX_SOURCES = \ $(SHADER_CXX_SOURCES) @@ -337,7 +332,7 @@ MESA_GALLIUM_CXX_SOURCES = \ # All the core C sources, for dependency checking ALL_SOURCES = \ - $(MESA_SOURCES_FOR_DEPEND) \ + $(MESA_SOURCES) \ $(MESA_CXX_SOURCES) \ $(MESA_ASM_SOURCES) \ $(STATETRACKER_SOURCES) |