glsl: Move glsl_to_nir files to LIBGLSL_FILES
authorKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Fri, 8 Jan 2016 20:35:18 +0000 (12:35 -0800)
committerKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Fri, 8 Jan 2016 22:26:12 +0000 (14:26 -0800)
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>
src/glsl/Makefile.sources

index fc10f14f4c18a75c04554fdf862d27b0471e635d..4da9b0728928849da432c9fb76d1a32b277b7849 100644 (file)
@@ -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 \