diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2011-03-01 15:22:43 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2011-03-01 15:22:43 -0800 |
| commit | 3158cc7df85a8c5bcdb90a7d9ebb62c72b5f052a (patch) | |
| tree | 57ef3663096b61c8c3e1c5ec9d3d90853404531f | |
| parent | 6b369c4c7cd8a52f99bbff2a57fb316b33a87495 (diff) | |
mesa: Fix build breakage caused by c73e6ce
| -rw-r--r-- | src/mesa/Makefile | 6 | ||||
| -rw-r--r-- | src/mesa/program/Makefile | 7 | ||||
| -rw-r--r-- | src/mesa/sources.mak | 14 |
3 files changed, 16 insertions, 11 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 48f79a5d550..10d73f000e3 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -74,6 +74,12 @@ main/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py m main/api_exec_es2.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py $(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES2.0 > $@ +program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y + bison -v -d --output=program/program_parse.tab.c $< + +program/lex.yy.c: program/program_lexer.l + flex --never-interactive --outfile=$@ $< + ###################################################################### # Helper libraries used by many drivers: diff --git a/src/mesa/program/Makefile b/src/mesa/program/Makefile deleted file mode 100644 index 400a543bdab..00000000000 --- a/src/mesa/program/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -all: program_parse.tab.c lex.yy.c - -program_parse.tab.c program_parse.tab.h: program_parse.y - bison -v -d $< - -lex.yy.c: program_lexer.l - flex --never-interactive $< diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak index a8c0bbd2b9a..35eaeb74f14 100644 --- a/src/mesa/sources.mak +++ b/src/mesa/sources.mak @@ -234,11 +234,9 @@ 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 \ @@ -254,6 +252,10 @@ 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 \ program/sampler.cpp @@ -301,7 +303,7 @@ COMMON_DRIVER_SOURCES = \ # Sources for building non-Gallium drivers -MESA_SOURCES = \ +MESA_SOURCES_FOR_DEPEND = \ $(MAIN_SOURCES) \ $(MATH_SOURCES) \ $(MATH_XFORM_SOURCES) \ @@ -313,6 +315,10 @@ MESA_SOURCES = \ $(COMMON_DRIVER_SOURCES)\ $(ASM_C_SOURCES) +MESA_SOURCES = \ + $(MESA_SOURCES_FOR_DEPEND) \ + $(PROGRAM_GENERATED_SOURCES) + MESA_CXX_SOURCES = \ $(SHADER_CXX_SOURCES) @@ -331,7 +337,7 @@ MESA_GALLIUM_CXX_SOURCES = \ # All the core C sources, for dependency checking ALL_SOURCES = \ - $(MESA_SOURCES) \ + $(MESA_SOURCES_FOR_DEPEND) \ $(MESA_CXX_SOURCES) \ $(MESA_ASM_SOURCES) \ $(STATETRACKER_SOURCES) |