From: Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Date: Fri, 8 Jan 2016 20:35:18 +0000 (-0800)
Subject: glsl: Move glsl_to_nir files to LIBGLSL_FILES
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e97caba1f6c2bd803f9c8b969b52c21f93daf1d0;p=mesa.git

glsl: Move glsl_to_nir files to LIBGLSL_FILES

libglsl_la_SOURCES includes both NIR_FILES and LIBGLSL_FILES, so for
libglsl.la consumers, this is a no-op. libnir.la however no longer uses
any GLSL IR infrastructure and can be used without also linking to
libglsl.la.

Acked-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index fc10f14f4c1..4da9b072892 100644
--- a/src/glsl/Makefile.sources
+++ b/src/glsl/Makefile.sources
@@ -18,8 +18,6 @@ NIR_GENERATED_FILES = \
 	nir/nir_opt_algebraic.c
 
 NIR_FILES = \
-	nir/glsl_to_nir.cpp \
-	nir/glsl_to_nir.h \
 	nir/glsl_types.cpp \
 	nir/glsl_types.h \
 	nir/builtin_type_macros.h \
@@ -184,6 +182,8 @@ LIBGLSL_FILES = \
 	lower_output_reads.cpp \
 	lower_shared_reference.cpp \
 	lower_ubo_reference.cpp \
+	nir/glsl_to_nir.cpp \
+	nir/glsl_to_nir.h \
 	opt_algebraic.cpp \
 	opt_array_splitting.cpp \
 	opt_conditional_discard.cpp \