Fix use of glsl_parser.{cc,h} where source dir != build dir.
authorDarren Salt <devspam@moreofthesa.me.uk>
Mon, 5 Nov 2012 21:26:47 +0000 (21:26 +0000)
committerMatt Turner <mattst88@gmail.com>
Sat, 10 Nov 2012 00:56:35 +0000 (16:56 -0800)
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@gmail.com>
src/glsl/builtin_compiler/Makefile.am

index 72032b524ada51534157ccd9553a2a88b4171b91..d6f85a7f44e6612afd9d48acddc76bbf1efdb2cb 100644 (file)
@@ -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 \