Mesa (master): glsl: Make the generated sources build rules more like NIR
Ian Romanick
idr at kemper.freedesktop.org
Wed Aug 17 12:51:15 UTC 2016
Module: Mesa
Branch: master
Commit: de71bc9eb6ebade3c48a42fef5d05023889fb2f8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=de71bc9eb6ebade3c48a42fef5d05023889fb2f8
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Wed Jul 13 18:02:10 2016 -0700
glsl: Make the generated sources build rules more like NIR
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
---
src/compiler/Android.glsl.gen.mk | 2 +-
src/compiler/Makefile.glsl.am | 4 +---
src/compiler/Makefile.sources | 5 +++--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/compiler/Android.glsl.gen.mk b/src/compiler/Android.glsl.gen.mk
index b2ea12c..157aa27 100644
--- 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 4e90f16..bfb3161 100644
--- 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 0ff9b23..fcc3401 100644
--- 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
More information about the mesa-commit
mailing list