radv: Rename query pipeline/set layout.

[mesa.git] / src / amd / Makefile.common.am

diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am
index 1425decb90e84132d914faa275647104604eda65..595876f610aa04e80d8fb49b1d030625aff47f2f 100644 (file)
--- a/src/amd/Makefile.common.am
+++ b/src/amd/Makefile.common.am
@@ -19,7 +19,7 @@
 # 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
 
@@ -30,6 +30,7 @@ common_libamd_common_la_CPPFLAGS = \
        -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 \
@@ -54,6 +55,7 @@ noinst_LTLIBRARIES += $(COMMON_LIBS)
 
 common_libamd_common_la_SOURCES = \
        $(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 +63,10 @@ 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
-       $(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