builtin_compiler/build: Use generated parser files
authorMatt Turner <mattst88@gmail.com>
Thu, 17 Jan 2013 22:40:21 +0000 (14:40 -0800)
committerMatt Turner <mattst88@gmail.com>
Tue, 22 Jan 2013 22:33:28 +0000 (14:33 -0800)
... instead of generating them again.

Tested-by: Andreas Boll <andreas.boll.dev@gmail.com>
src/glsl/builtin_compiler/Makefile.am

index d27aca5550e2b50e7c1d35133a776ab2c8a97b5e..a0255560b03e591e728feee34c82bda25ad1b73d 100644 (file)
@@ -40,19 +40,16 @@ AM_CFLAGS = \
 
 AM_CXXFLAGS = $(AM_CFLAGS)
 
-AM_YFLAGS = -v -d -p "glcpp_parser_"
-AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c
-
 include ../Makefile.sources
 
 noinst_PROGRAMS = builtin_compiler
 
 builtin_compiler_SOURCES = \
-       $(GLSL_SRCDIR)/glcpp/glcpp-lex.l \
-       $(GLSL_SRCDIR)/glcpp/glcpp-parse.y \
+       $(GLSL_BUILDDIR)/glcpp/glcpp-lex.c \
+       $(GLSL_BUILDDIR)/glcpp/glcpp-parse.c \
        $(LIBGLCPP_FILES) \
-       $(GLSL_SRCDIR)/glsl_lexer.ll \
-       $(GLSL_BUILDDIR)/glsl_parser.cc \
+       $(GLSL_BUILDDIR)/glsl_lexer.cpp \
+       $(GLSL_BUILDDIR)/glsl_parser.cpp \
        $(LIBGLSL_FILES) \
        $(LIBGLSL_CXX_FILES) \
        $(top_srcdir)/src/mesa/main/hash_table.c \
@@ -60,11 +57,3 @@ builtin_compiler_SOURCES = \
        $(top_srcdir)/src/mesa/program/symbol_table.c \
        $(GLSL_COMPILER_CXX_FILES) \
        builtin_stubs.cpp
-
-BUILT_SOURCES = \
-       glcpp-lex.c \
-       glcpp-parse.c \
-       glcpp-parse.h \
-       glsl_lexer.cc
-
-CLEANFILES = $(BUILT_SOURCES)