From: Matt Turner Date: Thu, 17 Jan 2013 22:40:21 +0000 (-0800) Subject: builtin_compiler/build: Use generated parser files X-Git-Tag: mesa-9.1-rc1~200 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3791ce05eb3c169c55b1d6eb5e613684e2cec4df;p=platform%2Fupstream%2Fmesa.git builtin_compiler/build: Use generated parser files ... instead of generating them again. Tested-by: Andreas Boll --- diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am index d27aca5..a025556 100644 --- a/src/glsl/builtin_compiler/Makefile.am +++ b/src/glsl/builtin_compiler/Makefile.am @@ -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)