From 0d39279448bbda6e824bcfd4997b4583bc0481af Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 17 Jul 2015 10:52:35 +0100 Subject: [PATCH] auxiliary: rework the python generated sources rules There are a few bits this commit aims to resolve: One can generalise the mkdir rule to a simple MKDIR_P $(@D) which will expand appropriately for even if we change the subdir name, and/or add new rules. We can also drop the explicit $(srcdir) prefix for the dependency rules, they they are not strictly required, nor used elsewhere in mesa. Finally replace $< with explicit filename to be consistent through the file, and honour PYTHON_FLAGS. v2: Add comprehensive commit summary/message (Ian, Matt) Cc: 11.0 Signed-off-by: Emil Velikov --- src/gallium/auxiliary/Makefile.am | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index 04f77d002c8..a728162bd9d 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -38,18 +38,23 @@ libgallium_la_SOURCES += \ endif -indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py - $(AM_V_at)$(MKDIR_P) indices - $(AM_V_GEN) $(PYTHON2) $< > $@ - -indices/u_unfilled_gen.c: $(srcdir)/indices/u_unfilled_gen.py - $(AM_V_at)$(MKDIR_P) indices - $(AM_V_GEN) $(PYTHON2) $< > $@ - -util/u_format_table.c: $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format_pack.py $(srcdir)/util/u_format_parse.py $(srcdir)/util/u_format.csv - $(AM_V_at)$(MKDIR_P) util - $(AM_V_GEN) $(PYTHON2) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@ - +MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) +PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) + +indices/u_indices_gen.c: indices/u_indices_gen.py + $(MKDIR_GEN) + $(PYTHON_GEN) $(srcdir)/indices/u_indices_gen.py > $@ + +indices/u_unfilled_gen.c: indices/u_unfilled_gen.py + $(MKDIR_GEN) + $(PYTHON_GEN) $(srcdir)/indices/u_unfilled_gen.py > $@ + +util/u_format_table.c: util/u_format_table.py \ + util/u_format_pack.py \ + util/u_format_parse.py \ + util/u_format.csv + $(MKDIR_GEN) + $(PYTHON_GEN) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@ noinst_LTLIBRARIES += libgalliumvl_stub.la libgalliumvl_stub_la_SOURCES = \ -- 2.30.2