X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Famd%2FMakefile.common.am;h=9d41b869034d3858b203e49459401177a6a4dda4;hb=da3330662f348de713cc9ae566d6f67187928c76;hp=1425decb90e84132d914faa275647104604eda65;hpb=b838f6423711a8f69073ed2c27773b50ffe14d2c;p=mesa.git

diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am
index 1425decb90e..9d41b869034 100644
--- a/src/amd/Makefile.common.am
+++ b/src/amd/Makefile.common.am
@@ -19,17 +19,19 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-if NEED_RADEON_LLVM
+if HAVE_GALLIUM_LLVM
 
 COMMON_LIBS = common/libamd_common.la
 
 # TODO cleanup these
 common_libamd_common_la_CPPFLAGS = \
+	$(AMDGPU_CFLAGS) \
 	$(VALGRIND_CFLAGS) \
 	$(DEFINES) \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src/amd/common \
 	-I$(top_srcdir)/src/amd/common \
 	-I$(top_builddir)/src/compiler \
 	-I$(top_builddir)/src/compiler/nir \
@@ -44,6 +46,7 @@ common_libamd_common_la_CFLAGS = \
 	$(VISIBILITY_CFLAGS) \
 	$(PTHREAD_CFLAGS) \
 	$(LLVM_CFLAGS) \
+	$(LIBDRM_CFLAGS) \
 	$(LIBELF_CFLAGS)
 
 common_libamd_common_la_CXXFLAGS = \
@@ -53,7 +56,9 @@ common_libamd_common_la_CXXFLAGS = \
 noinst_LTLIBRARIES += $(COMMON_LIBS)
 
 common_libamd_common_la_SOURCES = \
+	$(AMD_COMMON_FILES) \
 	$(AMD_COMPILER_FILES) \
+	$(AMD_DEBUG_FILES) \
 	$(AMD_GENERATED_FILES)
 
 # nir_to_llvm requires LLVM 3.9, which is only required as a minimum when
@@ -61,9 +66,12 @@ common_libamd_common_la_SOURCES = \
 if HAVE_RADEON_VULKAN
 common_libamd_common_la_SOURCES += $(AMD_NIR_FILES)
 endif
+endif
+
+common_libamd_common_la_LIBADD = $(LIBELF_LIBS)
 
-$(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 > $@
+common/sid_tables.h: $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h
+	$(AM_V_at)$(MKDIR_P) $(@D)
+	$(AM_V_GEN) $(PYTHON2) $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h > $@
 
 BUILT_SOURCES = $(AMD_GENERATED_FILES)
-endif