qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disable additional rules to regen sources when python is not found

Browse Source 
After a cvs import timestamps change which triggers rules that attempt
to call python to regenerate files.  When python is not found this
generates empty files that override those from the distfile, breaking
the build.

When building inside xenocara python is never found as the pkg paths
are not searched.
This commit is contained in:
jsg 2016-12-11 10:03:01 +00:00
parent d353257b8b
commit 2047dff595
7 changed files with 111 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mesa/src/compiler/Makefile.glsl.am
View File

@ -187,11 +187,11 @@ am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY))
am__v_YACC_0 = @echo " YACC " $@;
am__v_YACC_1 =
if REGEN_SOURCES
YACC_GEN = $(AM_V_YACC)$(YACC) $(YFLAGS)
LEX_GEN = $(AM_V_LEX)$(LEX) $(LFLAGS)
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
if REGEN_SOURCES
glsl/glsl_parser.cpp glsl/glsl_parser.h: glsl/glsl_parser.yy
$(MKDIR_GEN)
$(YACC_GEN) -o $@ -p "_mesa_glsl_" --defines=$(builddir)/glsl/glsl_parser.h $(srcdir)/glsl/glsl_parser.yy
@ -207,7 +207,6 @@ glsl/glcpp/glcpp-parse.c glsl/glcpp/glcpp-parse.h: glsl/glcpp/glcpp-parse.y
glsl/glcpp/glcpp-lex.c: glsl/glcpp/glcpp-lex.l
$(MKDIR_GEN)
$(LEX_GEN) -o $@ $(srcdir)/glsl/glcpp/glcpp-lex.l
endif
glsl/ir_expression_operation.h: glsl/ir_expression_operation.py
$(MKDIR_GEN)
@ -220,6 +219,7 @@ glsl/ir_expression_operation_constant.h: glsl/ir_expression_operation.py
glsl/ir_expression_operation_strings.h: glsl/ir_expression_operation.py
$(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py strings > $@ || ($(RM) $@; false)
endif
# Only the parsers (specifically the header files generated at the same time)
# need to be in BUILT_SOURCES. Though if we list the parser headers YACC is

53
lib/mesa/src/compiler/Makefile.in
View File

@ -1256,9 +1256,8 @@ AM_V_YACC = $(am__v_YACC_$(V))
am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY))
am__v_YACC_0 = @echo " YACC " $@;
am__v_YACC_1 =
@REGEN_SOURCES_TRUE@YACC_GEN = $(AM_V_YACC)$(YACC) $(YFLAGS)
@REGEN_SOURCES_TRUE@LEX_GEN = $(AM_V_LEX)$(LEX) $(LFLAGS)
@REGEN_SOURCES_TRUE@PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
YACC_GEN = $(AM_V_YACC)$(YACC) $(YFLAGS)
LEX_GEN = $(AM_V_LEX)$(LEX) $(LFLAGS)
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
nir_libnir_la_LIBADD = \
libcompiler.la
@ -2489,17 +2488,17 @@ uninstall-am:
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(LEX_GEN) -o $@ $(srcdir)/glsl/glcpp/glcpp-lex.l
glsl/ir_expression_operation.h: glsl/ir_expression_operation.py
$(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py enum > $@ || ($(RM) $@; false)
@REGEN_SOURCES_TRUE@glsl/ir_expression_operation.h: glsl/ir_expression_operation.py
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py enum > $@ || ($(RM) $@; false)
glsl/ir_expression_operation_constant.h: glsl/ir_expression_operation.py
$(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py constant > $@ || ($(RM) $@; false)
@REGEN_SOURCES_TRUE@glsl/ir_expression_operation_constant.h: glsl/ir_expression_operation.py
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py constant > $@ || ($(RM) $@; false)
glsl/ir_expression_operation_strings.h: glsl/ir_expression_operation.py
$(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py strings > $@ || ($(RM) $@; false)
@REGEN_SOURCES_TRUE@glsl/ir_expression_operation_strings.h: glsl/ir_expression_operation.py
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py strings > $@ || ($(RM) $@; false)
clean-local:
$(RM) -r subtest-cr subtest-cr-lf subtest-lf subtest-lf-cr
@ -2508,25 +2507,25 @@ dist-hook:
$(RM) glsl/glcpp/tests/*.out
$(RM) glsl/glcpp/tests/subtest*/*.out
nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py
$(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@ || ($(RM) $@; false)
@REGEN_SOURCES_TRUE@nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@ || ($(RM) $@; false)
nir/nir_constant_expressions.c: nir/nir_opcodes.py nir/nir_constant_expressions.py
$(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/nir/nir_constant_expressions.py > $@ || ($(RM) $@; false)
@REGEN_SOURCES_TRUE@nir/nir_constant_expressions.c: nir/nir_opcodes.py nir/nir_constant_expressions.py
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) $(srcdir)/nir/nir_constant_expressions.py > $@ || ($(RM) $@; false)
nir/nir_opcodes.h: nir/nir_opcodes.py nir/nir_opcodes_h.py
$(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/nir/nir_opcodes_h.py > $@ || ($(RM) $@; false)
@REGEN_SOURCES_TRUE@nir/nir_opcodes.h: nir/nir_opcodes.py nir/nir_opcodes_h.py
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) $(srcdir)/nir/nir_opcodes_h.py > $@ || ($(RM) $@; false)
nir/nir_opcodes.c: nir/nir_opcodes.py nir/nir_opcodes_c.py
$(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/nir/nir_opcodes_c.py > $@ || ($(RM) $@; false)
@REGEN_SOURCES_TRUE@nir/nir_opcodes.c: nir/nir_opcodes.py nir/nir_opcodes_c.py
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) $(srcdir)/nir/nir_opcodes_c.py > $@ || ($(RM) $@; false)
nir/nir_opt_algebraic.c: nir/nir_opt_algebraic.py nir/nir_algebraic.py
$(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/nir/nir_opt_algebraic.py > $@ || ($(RM) $@; false)
@REGEN_SOURCES_TRUE@nir/nir_opt_algebraic.c: nir/nir_opt_algebraic.py nir/nir_algebraic.py
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) $(srcdir)/nir/nir_opt_algebraic.py > $@ || ($(RM) $@; false)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

2
lib/mesa/src/compiler/Makefile.nir.am
View File

@ -33,6 +33,7 @@ nir_libnir_la_SOURCES = \
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
if REGEN_SOURCES
nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py
$(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@ || ($(RM) $@; false)
@ -52,6 +53,7 @@ nir/nir_opcodes.c: nir/nir_opcodes.py nir/nir_opcodes_c.py
nir/nir_opt_algebraic.c: nir/nir_opt_algebraic.py nir/nir_algebraic.py
$(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/nir/nir_opt_algebraic.py > $@ || ($(RM) $@; false)
endif
noinst_PROGRAMS += spirv2nir

2
lib/mesa/src/gallium/drivers/swr/Makefile.am
View File

@ -63,6 +63,7 @@ BUILT_SOURCES = \
rasterizer/archrast/gen_ar_eventhandler.h \
rasterizer/archrast/gen_ar_eventhandlerfile.h
if REGEN_SOURCES
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
swr_context_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py swr_context.h
@ -145,6 +146,7 @@ rasterizer/archrast/gen_ar_eventhandlerfile.h: rasterizer/scripts/gen_archrast.p
--proto $(srcdir)/rasterizer/archrast/events.proto \
--output rasterizer/archrast/gen_ar_eventhandlerfile.h \
--gen_eventhandlerfile_h
endif
COMMON_LIBADD = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \

144
lib/mesa/src/gallium/drivers/swr/Makefile.in
View File

@ -864,8 +864,8 @@ BUILT_SOURCES = \
rasterizer/archrast/gen_ar_eventhandler.h \
rasterizer/archrast/gen_ar_eventhandlerfile.h
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
@REGEN_SOURCES_TRUE@MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
@REGEN_SOURCES_TRUE@PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
COMMON_LIBADD = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/mesa/libmesagallium.la \
@ -2375,86 +2375,86 @@ uninstall-am: uninstall-libLTLIBRARIES
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-libLTLIBRARIES
swr_context_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py swr_context.h
$(PYTHON_GEN) \
$(srcdir)/rasterizer/jitter/scripts/gen_llvm_types.py \
--input $(srcdir)/swr_context.h \
--output swr_context_llvm.h
@REGEN_SOURCES_TRUE@swr_context_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py swr_context.h
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) \
@REGEN_SOURCES_TRUE@ $(srcdir)/rasterizer/jitter/scripts/gen_llvm_types.py \
@REGEN_SOURCES_TRUE@ --input $(srcdir)/swr_context.h \
@REGEN_SOURCES_TRUE@ --output swr_context_llvm.h
rasterizer/scripts/gen_knobs.cpp rasterizer/scripts/gen_knobs.h: rasterizer/scripts/gen_knobs.py rasterizer/scripts/knob_defs.py rasterizer/scripts/templates/knobs.template
$(MKDIR_GEN)
$(PYTHON_GEN) \
$(srcdir)/rasterizer/scripts/gen_knobs.py \
rasterizer/scripts
@REGEN_SOURCES_TRUE@rasterizer/scripts/gen_knobs.cpp rasterizer/scripts/gen_knobs.h: rasterizer/scripts/gen_knobs.py rasterizer/scripts/knob_defs.py rasterizer/scripts/templates/knobs.template
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) \
@REGEN_SOURCES_TRUE@ $(srcdir)/rasterizer/scripts/gen_knobs.py \
@REGEN_SOURCES_TRUE@ rasterizer/scripts
rasterizer/jitter/state_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py rasterizer/core/state.h
$(MKDIR_GEN)
$(PYTHON_GEN) \
$(srcdir)/rasterizer/jitter/scripts/gen_llvm_types.py \
--input $(srcdir)/rasterizer/core/state.h \
--output rasterizer/jitter/state_llvm.h
@REGEN_SOURCES_TRUE@rasterizer/jitter/state_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py rasterizer/core/state.h
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) \
@REGEN_SOURCES_TRUE@ $(srcdir)/rasterizer/jitter/scripts/gen_llvm_types.py \
@REGEN_SOURCES_TRUE@ --input $(srcdir)/rasterizer/core/state.h \
@REGEN_SOURCES_TRUE@ --output rasterizer/jitter/state_llvm.h
rasterizer/jitter/builder_gen.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
$(MKDIR_GEN)
$(PYTHON_GEN) \
$(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
--input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
--output rasterizer/jitter/builder_gen.h \
--gen_h
@REGEN_SOURCES_TRUE@rasterizer/jitter/builder_gen.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) \
@REGEN_SOURCES_TRUE@ $(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
@REGEN_SOURCES_TRUE@ --input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
@REGEN_SOURCES_TRUE@ --output rasterizer/jitter/builder_gen.h \
@REGEN_SOURCES_TRUE@ --gen_h
rasterizer/jitter/builder_gen.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
$(MKDIR_GEN)
$(PYTHON_GEN) \
$(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
--input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
--output rasterizer/jitter/builder_gen.cpp \
--gen_cpp
@REGEN_SOURCES_TRUE@rasterizer/jitter/builder_gen.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) \
@REGEN_SOURCES_TRUE@ $(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
@REGEN_SOURCES_TRUE@ --input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
@REGEN_SOURCES_TRUE@ --output rasterizer/jitter/builder_gen.cpp \
@REGEN_SOURCES_TRUE@ --gen_cpp
rasterizer/jitter/builder_x86.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
$(MKDIR_GEN)
$(PYTHON_GEN) \
$(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
--output rasterizer/jitter/builder_x86.h \
--gen_x86_h
@REGEN_SOURCES_TRUE@rasterizer/jitter/builder_x86.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) \
@REGEN_SOURCES_TRUE@ $(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
@REGEN_SOURCES_TRUE@ --output rasterizer/jitter/builder_x86.h \
@REGEN_SOURCES_TRUE@ --gen_x86_h
rasterizer/jitter/builder_x86.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
$(MKDIR_GEN)
$(PYTHON_GEN) \
$(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
--output rasterizer/jitter/builder_x86.cpp \
--gen_x86_cpp
@REGEN_SOURCES_TRUE@rasterizer/jitter/builder_x86.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) \
@REGEN_SOURCES_TRUE@ $(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
@REGEN_SOURCES_TRUE@ --output rasterizer/jitter/builder_x86.cpp \
@REGEN_SOURCES_TRUE@ --gen_x86_cpp
rasterizer/archrast/gen_ar_event.h: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_event_h.template rasterizer/archrast/events.proto
$(MKDIR_GEN)
$(PYTHON_GEN) \
$(srcdir)/rasterizer/scripts/gen_archrast.py \
--proto $(srcdir)/rasterizer/archrast/events.proto \
--output rasterizer/archrast/gen_ar_event.h \
--gen_event_h
@REGEN_SOURCES_TRUE@rasterizer/archrast/gen_ar_event.h: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_event_h.template rasterizer/archrast/events.proto
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) \
@REGEN_SOURCES_TRUE@ $(srcdir)/rasterizer/scripts/gen_archrast.py \
@REGEN_SOURCES_TRUE@ --proto $(srcdir)/rasterizer/archrast/events.proto \
@REGEN_SOURCES_TRUE@ --output rasterizer/archrast/gen_ar_event.h \
@REGEN_SOURCES_TRUE@ --gen_event_h
rasterizer/archrast/gen_ar_event.cpp: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_event_cpp.template rasterizer/archrast/events.proto
$(MKDIR_GEN)
$(PYTHON_GEN) \
$(srcdir)/rasterizer/scripts/gen_archrast.py \
--proto $(srcdir)/rasterizer/archrast/events.proto \
--output rasterizer/archrast/gen_ar_event.cpp \
--gen_event_cpp
@REGEN_SOURCES_TRUE@rasterizer/archrast/gen_ar_event.cpp: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_event_cpp.template rasterizer/archrast/events.proto
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) \
@REGEN_SOURCES_TRUE@ $(srcdir)/rasterizer/scripts/gen_archrast.py \
@REGEN_SOURCES_TRUE@ --proto $(srcdir)/rasterizer/archrast/events.proto \
@REGEN_SOURCES_TRUE@ --output rasterizer/archrast/gen_ar_event.cpp \
@REGEN_SOURCES_TRUE@ --gen_event_cpp
rasterizer/archrast/gen_ar_eventhandler.h: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_eventhandler_h.template rasterizer/archrast/events.proto
$(MKDIR_GEN)
$(PYTHON_GEN) \
$(srcdir)/rasterizer/scripts/gen_archrast.py \
--proto $(srcdir)/rasterizer/archrast/events.proto \
--output rasterizer/archrast/gen_ar_eventhandler.h \
--gen_eventhandler_h
@REGEN_SOURCES_TRUE@rasterizer/archrast/gen_ar_eventhandler.h: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_eventhandler_h.template rasterizer/archrast/events.proto
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) \
@REGEN_SOURCES_TRUE@ $(srcdir)/rasterizer/scripts/gen_archrast.py \
@REGEN_SOURCES_TRUE@ --proto $(srcdir)/rasterizer/archrast/events.proto \
@REGEN_SOURCES_TRUE@ --output rasterizer/archrast/gen_ar_eventhandler.h \
@REGEN_SOURCES_TRUE@ --gen_eventhandler_h
rasterizer/archrast/gen_ar_eventhandlerfile.h: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_eventhandlerfile_h.template rasterizer/archrast/events.proto
$(MKDIR_GEN)
$(PYTHON_GEN) \
$(srcdir)/rasterizer/scripts/gen_archrast.py \
--proto $(srcdir)/rasterizer/archrast/events.proto \
--output rasterizer/archrast/gen_ar_eventhandlerfile.h \
--gen_eventhandlerfile_h
@REGEN_SOURCES_TRUE@rasterizer/archrast/gen_ar_eventhandlerfile.h: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_eventhandlerfile_h.template rasterizer/archrast/events.proto
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) \
@REGEN_SOURCES_TRUE@ $(srcdir)/rasterizer/scripts/gen_archrast.py \
@REGEN_SOURCES_TRUE@ --proto $(srcdir)/rasterizer/archrast/events.proto \
@REGEN_SOURCES_TRUE@ --output rasterizer/archrast/gen_ar_eventhandlerfile.h \
@REGEN_SOURCES_TRUE@ --gen_eventhandlerfile_h
# XXX: As we cannot use BUILT_SOURCES (the files will end up in the dist
# tarball) just annotate the dependency directly.

10
lib/mesa/src/intel/Makefile.in
View File

@ -1419,11 +1419,11 @@ $(GENXML_GENERATED_FILES): Makefile
cat $< | $(XXD) -i >> $@; \
echo "};" >> $@
isl/isl_format_layout.c: isl/gen_format_layout.py \
isl/isl_format_layout.csv
$(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/isl/gen_format_layout.py \
--csv $(srcdir)/isl/isl_format_layout.csv --out $@
@REGEN_SOURCES_TRUE@isl/isl_format_layout.c: isl/gen_format_layout.py \
@REGEN_SOURCES_TRUE@ isl/isl_format_layout.csv
@REGEN_SOURCES_TRUE@ $(MKDIR_GEN)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) $(srcdir)/isl/gen_format_layout.py \
@REGEN_SOURCES_TRUE@ --csv $(srcdir)/isl/isl_format_layout.csv --out $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

2
lib/mesa/src/intel/Makefile.isl.am
View File

@ -57,11 +57,13 @@ isl_libisl_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90
BUILT_SOURCES += $(ISL_GENERATED_FILES)
if REGEN_SOURCES
isl/isl_format_layout.c: isl/gen_format_layout.py \
isl/isl_format_layout.csv
$(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/isl/gen_format_layout.py \
--csv $(srcdir)/isl/isl_format_layout.csv --out $@
endif
# ----------------------------------------------------------------------------
# Tests