glsl: Make the generated sources build rules more like NIR

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/compiler/Android.glsl.gen.mk b/src/compiler/Android.glsl.gen.mk
index b2ea12cb4abdf70092272e31e6ca9513adfbaded..157aa278b38dafabb8ff839717b9c6204bbb390d 100644 (file)
--- a/src/compiler/Android.glsl.gen.mk
+++ b/src/compiler/Android.glsl.gen.mk
@@ -39,7 +39,7 @@ LOCAL_C_INCLUDES += \
 
 LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
        $(LIBGLCPP_GENERATED_FILES) \
-       $(LIBGLSL_GENERATED_CXX_FILES))
+       $(LIBGLSL_GENERATED_FILES))
 
 define local-l-or-ll-to-c-or-cpp
        @mkdir -p $(dir $@)

diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am
index 4e90f16b4e922dd07dd166b9511e131e7ec1bec1..bfb31613f3315446ab5a3d88a1f81e309ea15ba3 100644 (file)
--- a/src/compiler/Makefile.glsl.am
+++ b/src/compiler/Makefile.glsl.am
@@ -116,9 +116,7 @@ glsl_libglsl_la_LIBADD = \
        glsl/libglcpp.la
 
 glsl_libglsl_la_SOURCES =                              \
-       glsl/glsl_lexer.cpp                             \
-       glsl/glsl_parser.cpp                            \
-       glsl/glsl_parser.h                              \
+       $(LIBGLSL_GENERATED_FILES)                      \
        $(LIBGLSL_FILES)
 
 

diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources
index 0ff9b23e4c38da42cb0c72ef1034d97b3a040294..fcc34019d0daccbb0636d5c4231e13e7083a032c 100644 (file)
--- a/src/compiler/Makefile.sources
+++ b/src/compiler/Makefile.sources
@@ -144,9 +144,10 @@ GLSL_COMPILER_CXX_FILES = \
        glsl/standalone.h
 
 # libglsl generated sources
-LIBGLSL_GENERATED_CXX_FILES = \
+LIBGLSL_GENERATED_FILES = \
        glsl/glsl_lexer.cpp \
-       glsl/glsl_parser.cpp
+       glsl/glsl_parser.cpp \
+       glsl/glsl_parser.h
 
 # libglcpp