summaryrefslogtreecommitdiff
path: root/doxygen
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2012-07-13 22:29:03 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2012-07-15 15:27:26 +0100
commit81de0431d6f52084e01874163657e141e6beffdf (patch)
tree660cb75e7ecd20ba484d117f29f92e17084010a6 /doxygen
parentbc6bff79475ab0996923a105fa699a19fb65455e (diff)
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 <jon.turney@dronecode.org.uk>
Diffstat (limited to 'doxygen')
-rw-r--r--doxygen/glsl.doxy5
1 files changed, 2 insertions, 3 deletions
diff --git a/doxygen/glsl.doxy b/doxygen/glsl.doxy
index 5411ec44b7..aa907aec6b 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 =
#---------------------------------------------------------------------------