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>

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 $@)

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)
 
 

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