Module: Mesa
Branch: master
Commit: d1dc22eb4661dbb343920bb36a9c71accec334d5
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d1dc22eb4661dbb343920bb36a9c71accec334d5
Author: Emil Velikov <emil.veli...@collabora.com>
Date: Thu Jan 12 17:34:15 2017 +0000
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 <emil.veli...@collabora.com>
---
src/amd/Makefile.am | 2 +-
src/amd/Makefile.common.am | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/amd/Makefile.am b/src/amd/Makefile.am
index 0a8456d..7d191af 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 533ad17..b5fce2b 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
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
