diff options
| author | Emil Velikov <[email protected]> | 2015-07-17 10:44:30 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-09-11 19:19:30 +0100 |
| commit | 2190f218ad2197d98fe9ebd8e1cf651e39d1120f (patch) | |
| tree | 195d0782cab62de64b31a3b19380a56872f2bba3 | |
| parent | 2c27775a4434b7133ccda223e34e36a9a8cd4c6a (diff) | |
mesa: automake: rework the source generation rules
Same logic as previous commit applies.
Additionally remove the odd (set -e/mv/INDENT) from the rules.
The last one is the only one we remotely care about, if reading the
generated sources.
Upcoming work from DylanB which will replace the existing python
scripts with ones that produce more readable output anyway.
Cc: 11.0 <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
(cherry picked from commit fd913f47b7fcc724d8d191f2752f328d037abb20)
| -rw-r--r-- | src/mesa/Makefile.am | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index eb4a3da3c84..69506f2a3fd 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -90,37 +90,24 @@ CLEANFILES = \ program/program_parse.tab.h \ main/git_sha1.h.tmp -GET_HASH_GEN = main/get_hash_generator.py +PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) -main/get_hash.h: ../mapi/glapi/gen/gl_and_es_API.xml main/get_hash_params.py \ - $(GET_HASH_GEN) - $(AM_V_GEN)set -e; \ - $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/$(GET_HASH_GEN) \ - -f $< > [email protected]; \ - mv [email protected] $@; +main/get_hash.h: ../mapi/glapi/gen/gl_and_es_API.xml main/get_hash_params.py \ + main/get_hash_generator.py + $(PYTHON_GEN) $(srcdir)/main/get_hash_generator.py \ + -f $(srcdir)/../mapi/glapi/gen/gl_and_es_API.xml > $@ -main/format_info.h: main/formats.csv \ +main/format_info.h: main/formats.csv \ main/format_parser.py main/format_info.py - $(AM_V_GEN)set -e; \ - $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/main/format_info.py \ - $< > [email protected]; \ - mv [email protected] $@; + $(PYTHON_GEN) $(srcdir)/main/format_info.py $(srcdir)/main/formats.csv > $@ -main/format_pack.c: main/format_pack.py main/formats.csv \ +main/format_pack.c: main/format_pack.py main/formats.csv \ main/format_parser.py - $(AM_V_GEN)set -e; \ - $(PYTHON2) $(PYTHON_FLAGS) \ - $(srcdir)/main/format_pack.py \ - $(srcdir)/main/formats.csv \ - | $(INDENT) $(INDENT_FLAGS) > $@; + $(PYTHON_GEN) $(srcdir)/main/format_pack.py $(srcdir)/main/formats.csv > $@ main/format_unpack.c: main/format_unpack.py main/formats.csv \ main/format_parser.py - $(AM_V_GEN)set -e; \ - $(PYTHON2) $(PYTHON_FLAGS) \ - $(srcdir)/main/format_unpack.py \ - $(srcdir)/main/formats.csv \ - | $(INDENT) $(INDENT_FLAGS) > $@; + $(PYTHON_GEN) $(srcdir)/main/format_unpack.py $(srcdir)/main/formats.csv > $@ main/formats.c: main/format_info.h @@ -201,13 +188,17 @@ libmesa_sse41_la_CFLAGS = $(AM_CFLAGS) $(SSE41_CFLAGS) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gl.pc +MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) +YACC_GEN = $(AM_V_GEN)$(YACC) $(YFLAGS) +LEX_GEN = $(AM_V_GEN)$(LEX) $(LFLAGS) + program/lex.yy.c: program/program_lexer.l - $(AM_V_at)$(MKDIR_P) program - $(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $< + $(MKDIR_GEN) + $(LEX_GEN) -o $@ $(srcdir)/program/program_lexer.l program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y - $(AM_V_at)$(MKDIR_P) program - $(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=program/program_parse.tab.c $< + $(MKDIR_GEN) + $(YACC_GEN) -o $@ -p "_mesa_program_" --defines=$(builddir)/program/program_parse.tab.h $(srcdir)/program/program_parse.y if GEN_ASM_OFFSETS matypes.h: $(gen_matypes_SOURCES) |