X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fcompiler%2FMakefile.nir.am;h=13f02a7fc29c3139d3a763ed536997814bd87280;hb=a18ab92d3c21b47efe376ea1efdbc4128b26316c;hp=e1acf8a29a2e4b3433f0aedce1ed0140906a949e;hpb=8d51500b2dec1dbe54a517e3b1448e96978e2256;p=mesa.git

diff --git a/src/compiler/Makefile.nir.am b/src/compiler/Makefile.nir.am
index e1acf8a29a2..13f02a7fc29 100644
--- a/src/compiler/Makefile.nir.am
+++ b/src/compiler/Makefile.nir.am
@@ -23,20 +23,14 @@
 
 noinst_LTLIBRARIES += nir/libnir.la
 
-nir_libnir_la_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_srcdir)/src/compiler/nir
-
 nir_libnir_la_LIBADD = \
 	libcompiler.la
 
 nir_libnir_la_SOURCES =					\
 	$(NIR_FILES)					\
+	$(SPIRV_FILES)					\
 	$(NIR_GENERATED_FILES)
 
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
-
 nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@ || ($(RM) $@; false)
@@ -57,6 +51,24 @@ nir/nir_opt_algebraic.c: nir/nir_opt_algebraic.py nir/nir_algebraic.py
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) $(srcdir)/nir/nir_opt_algebraic.py > $@ || ($(RM) $@; false)
 
+noinst_PROGRAMS += spirv2nir
+
+spirv2nir_SOURCES = \
+	spirv/spirv2nir.c
+
+spirv2nir_CPPFLAGS =					\
+	$(AM_CPPFLAGS)					\
+	-I$(top_builddir)/src/compiler/nir		\
+	-I$(top_srcdir)/src/compiler/nir		\
+	-I$(top_srcdir)/src/compiler/spirv
+
+spirv2nir_LDADD =					\
+	nir/libnir.la					\
+	$(top_builddir)/src/util/libmesautil.la		\
+	-lm						\
+	$(PTHREAD_LIBS)
+
+nodist_EXTRA_spirv2nir_SOURCES = dummy.cpp
 
 check_PROGRAMS += nir/tests/control_flow_tests
 
@@ -90,4 +102,6 @@ EXTRA_DIST += \
 	nir/nir_opcodes_c.py				\
 	nir/nir_opcodes_h.py				\
 	nir/nir_opt_algebraic.py			\
-	nir/tests
+	nir/tests \
+	nir/README \
+	SConscript.nir