From 81de0431d6f52084e01874163657e141e6beffdf Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Fri, 13 Jul 2012 22:29:03 +0100 Subject: Fix building glsl when using automake-1.12 after 68e04cc6 Commit 68e04cc6 was tested using automake-1.11. Unfortunately, automake-1.12 made a "slightly backward-incompatible change" in the use of yacc with C++, and for a .yy file, the generated header file is now named .hh, not .h To work with both, write our own rule for running yacc, which generates a header file named .h, rather than using automake's rule. Also, remove things from BUILD_SOURCES which don't need to be there Also, update EXCLUDE rules in doxygen/glsl.doxy, for change of generated files from .cpp -> .cc, and glsl_lexer.h has never existed. Signed-off-by: Jon TURNEY --- doxygen/glsl.doxy | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'doxygen') diff --git a/doxygen/glsl.doxy b/doxygen/glsl.doxy index 5411ec4..aa907ae 100644 --- a/doxygen/glsl.doxy +++ b/doxygen/glsl.doxy @@ -11,9 +11,8 @@ PROJECT_NAME = "Mesa GLSL module" #--------------------------------------------------------------------------- INPUT = ../src/glsl/ RECURSIVE = NO -EXCLUDE = ../src/glsl/glsl_lexer.cpp \ - ../src/glsl/glsl_lexer.h \ - ../src/glsl/glsl_parser.cpp \ +EXCLUDE = ../src/glsl/glsl_lexer.cc \ + ../src/glsl/glsl_parser.cc \ ../src/glsl/glsl_parser.h EXCLUDE_PATTERNS = #--------------------------------------------------------------------------- -- cgit v1.1