Mesa (master): Fix use of glsl_parser.{cc, h} where source dir != build dir.

Matt Turner mattst88 at kemper.freedesktop.org
Sat Nov 10 00:54:55 UTC 2012


Module: Mesa
Branch: master
Commit: d2a6dd9a953c08c427f0eeeed1c7b73f8e641590
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d2a6dd9a953c08c427f0eeeed1c7b73f8e641590

Author: Darren Salt <devspam at moreofthesa.me.uk>
Date:   Mon Nov  5 21:26:47 2012 +0000

Fix use of glsl_parser.{cc,h} where source dir != build dir.

Fixes a regression caused by commit 9948a3365.

https://bugs.freedesktop.org/show_bug.cgi?id=56787
https://bugs.freedesktop.org/show_bug.cgi?id=56685
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/glsl/builtin_compiler/Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am
index 72032b5..d6f85a7 100644
--- a/src/glsl/builtin_compiler/Makefile.am
+++ b/src/glsl/builtin_compiler/Makefile.am
@@ -35,6 +35,7 @@ AM_CFLAGS = \
 	-I $(top_srcdir)/src/mesa \
 	-I $(GLSL_SRCDIR) \
 	-I $(GLSL_SRCDIR)/glcpp \
+	-I $(GLSL_BUILDDIR) \
 	$(DEFINES_FOR_BUILD)
 
 AM_CXXFLAGS = $(AM_CFLAGS)
@@ -51,7 +52,7 @@ builtin_compiler_SOURCES = \
 	$(GLSL_SRCDIR)/glcpp/glcpp-parse.y \
 	$(LIBGLCPP_FILES) \
 	$(GLSL_SRCDIR)/glsl_lexer.ll \
-	$(GLSL_SRCDIR)/glsl_parser.cc \
+	$(GLSL_BUILDDIR)/glsl_parser.cc \
 	$(LIBGLSL_FILES) \
 	$(LIBGLSL_CXX_FILES) \
 	$(top_srcdir)/src/mesa/program/hash_table.c \




More information about the mesa-commit mailing list