summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBas Nieuwenhuizen <[email protected]>2016-12-24 11:53:41 +0100
committerBas Nieuwenhuizen <[email protected]>2017-01-09 21:43:54 +0100
commitb838f6423711a8f69073ed2c27773b50ffe14d2c (patch)
tree4813023f211eae5f70c6778f037712c78f575e57 /src
parent1c5dcecd51fb8072a9563d838dc33565061f9542 (diff)
ac/debug: Move sid_tables.h generation to common code.
Signed-off-by: Bas Nieuwenhuizen <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Reviewed-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/amd/Makefile.am2
-rw-r--r--src/amd/Makefile.common.am8
-rw-r--r--src/amd/Makefile.sources3
-rwxr-xr-xsrc/amd/common/sid_tables.py (renamed from src/gallium/drivers/radeonsi/sid_tables.py)0
-rw-r--r--src/gallium/drivers/radeonsi/Makefile.am11
-rw-r--r--src/gallium/drivers/radeonsi/Makefile.sources3
6 files changed, 12 insertions, 15 deletions
diff --git a/src/amd/Makefile.am b/src/amd/Makefile.am
index 1402ca54a7d..0a8456d1e4d 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)
+EXTRA_DIST = $(COMMON_HEADER_FILES) $(srcdir)/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 1a36e48101c..1425decb90e 100644
--- a/src/amd/Makefile.common.am
+++ b/src/amd/Makefile.common.am
@@ -52,7 +52,9 @@ common_libamd_common_la_CXXFLAGS = \
noinst_LTLIBRARIES += $(COMMON_LIBS)
-common_libamd_common_la_SOURCES = $(AMD_COMPILER_FILES)
+common_libamd_common_la_SOURCES = \
+ $(AMD_COMPILER_FILES) \
+ $(AMD_GENERATED_FILES)
# nir_to_llvm requires LLVM 3.9, which is only required as a minimum when
# radv is built.
@@ -60,4 +62,8 @@ if HAVE_RADEON_VULKAN
common_libamd_common_la_SOURCES += $(AMD_NIR_FILES)
endif
+$(srcdir)/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
diff --git a/src/amd/Makefile.sources b/src/amd/Makefile.sources
index 122ef71c452..bde02d16a88 100644
--- a/src/amd/Makefile.sources
+++ b/src/amd/Makefile.sources
@@ -36,3 +36,6 @@ AMD_COMPILER_FILES = \
AMD_NIR_FILES = \
common/ac_nir_to_llvm.c \
common/ac_nir_to_llvm.h
+
+AMD_GENERATED_FILES = \
+ common/sid_tables.h
diff --git a/src/gallium/drivers/radeonsi/sid_tables.py b/src/amd/common/sid_tables.py
index 7ba021544b0..7ba021544b0 100755
--- a/src/gallium/drivers/radeonsi/sid_tables.py
+++ b/src/amd/common/sid_tables.py
diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am
index 0ed955db22c..00c8a328c92 100644
--- a/src/gallium/drivers/radeonsi/Makefile.am
+++ b/src/gallium/drivers/radeonsi/Makefile.am
@@ -31,13 +31,4 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libradeonsi.la
-libradeonsi_la_SOURCES = $(C_SOURCES) $(GENERATED_SOURCES)
-
-sid_tables.h: $(srcdir)/sid_tables.py $(top_srcdir)/src/amd/common/sid.h
- $(AM_V_GEN) $(PYTHON2) $(srcdir)/sid_tables.py $(top_srcdir)/src/amd/common/sid.h > $@
-
-EXTRA_DIST = \
- sid_tables.py
-
-BUILT_SOURCES =\
- sid_tables.h
+libradeonsi_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/drivers/radeonsi/Makefile.sources b/src/gallium/drivers/radeonsi/Makefile.sources
index 727a9cccfc2..15ae9771477 100644
--- a/src/gallium/drivers/radeonsi/Makefile.sources
+++ b/src/gallium/drivers/radeonsi/Makefile.sources
@@ -23,6 +23,3 @@ C_SOURCES := \
si_state_shaders.c \
si_state.h \
si_uvd.c
-
-GENERATED_SOURCES := \
- sid_tables.h