From: Emil Velikov Date: Thu, 12 Jan 2017 17:34:15 +0000 (+0000) Subject: ac: automake: rework sid_tables.h generation X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d1dc22eb4661dbb343920bb36a9c71accec334d5;p=mesa.git ac: automake: rework sid_tables.h generation Drop $(srcdir)/ prefix analogous to before the file (and rule) movement and move it outside of the NEED_RADEON_LLVM conditional. Otherwise the build may fail as below. make[3]: *** No rule to make target 'common/sid_tables.h', needed by 'distdir'. Stop. Fixes: b838f642371 "ac/debug: Move sid_tables.h generation to common code." Signed-off-by: Emil Velikov --- diff --git a/src/amd/Makefile.am b/src/amd/Makefile.am index 0a8456d1e4d..7d191af4431 100644 --- a/src/amd/Makefile.am +++ b/src/amd/Makefile.am @@ -23,6 +23,6 @@ include Makefile.sources noinst_LTLIBRARIES = -EXTRA_DIST = $(COMMON_HEADER_FILES) $(srcdir)/common/sid_tables.py +EXTRA_DIST = $(COMMON_HEADER_FILES) common/sid_tables.py include Makefile.addrlib.am include Makefile.common.am diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am index 533ad17de59..b5fce2b4e07 100644 --- a/src/amd/Makefile.common.am +++ b/src/amd/Makefile.common.am @@ -62,9 +62,9 @@ common_libamd_common_la_SOURCES = \ if HAVE_RADEON_VULKAN common_libamd_common_la_SOURCES += $(AMD_NIR_FILES) endif +endif -$(srcdir)/common/sid_tables.h: $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h +common/sid_tables.h: $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(AM_V_GEN) $(PYTHON2) $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h > $@ BUILT_SOURCES = $(AMD_GENERATED_FILES) -endif