From 8730e9320a833a9eb0e65074f9988950b7424c0c Mon Sep 17 00:00:00 2001 From: "Christopher L. Conway" Date: Tue, 30 Mar 2010 20:22:33 +0000 Subject: Merging from branches/antlr3 (r246:354) --- src/parser/cvc/Makefile.am | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'src/parser/cvc/Makefile.am') diff --git a/src/parser/cvc/Makefile.am b/src/parser/cvc/Makefile.am index c1b5f752e..f02c9345c 100644 --- a/src/parser/cvc/Makefile.am +++ b/src/parser/cvc/Makefile.am @@ -1,30 +1,30 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4PARSERLIB \ - -I@srcdir@/../../include -I@srcdir@/../.. + -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES) AM_CXXFLAGS = -Wall -fvisibility=hidden +# Compile generated C files using C++ compiler +CC=$(CXX) noinst_LTLIBRARIES = libparsercvc.la ANTLR_TOKEN_STUFF = \ - @srcdir@/generated/CvcVocabularyTokenTypes.hpp \ - @srcdir@/generated/CvcVocabularyTokenTypes.txt \ - @srcdir@/generated/AntlrCvcParserTokenTypes.hpp \ - @srcdir@/generated/AntlrCvcParserTokenTypes.txt + @srcdir@/generated/Cvc.tokens ANTLR_LEXER_STUFF = \ - @srcdir@/generated/AntlrCvcLexer.hpp \ - @srcdir@/generated/AntlrCvcLexer.cpp \ - $(ANTLR_TOKEN_STUFF) + @srcdir@/generated/CvcLexer.h \ + @srcdir@/generated/CvcLexer.c \ + $(ANTLR_TOKEN_STUFF) ANTLR_PARSER_STUFF = \ - @srcdir@/generated/AntlrCvcParser.hpp \ - @srcdir@/generated/AntlrCvcParser.cpp + @srcdir@/generated/CvcParser.h \ + @srcdir@/generated/CvcParser.c ANTLR_STUFF = \ - $(ANTLR_LEXER_STUFF) \ - $(ANTLR_PARSER_STUFF) + $(ANTLR_LEXER_STUFF) \ + $(ANTLR_PARSER_STUFF) libparsercvc_la_SOURCES = \ - cvc_lexer.g \ - cvc_parser.g \ - $(ANTLR_STUFF) + Cvc.g \ + cvc_input.h \ + cvc_input.cpp \ + $(ANTLR_STUFF) BUILT_SOURCES = $(ANTLR_STUFF) dist-hook: $(ANTLR_STUFF) @@ -36,16 +36,14 @@ maintainer-clean-local: @srcdir@/stamp-generated: mkdir -p @srcdir@/generated touch @srcdir@/stamp-generated + # antlr doesn't overwrite output files, it just leaves them. So we have to delete them first. -@srcdir@/generated/AntlrCvcLexer.hpp: cvc_lexer.g @srcdir@/stamp-generated - $(AM_V_at)-rm -f $(ANTLR_LEXER_STUFF) - $(AM_V_GEN)$(ANTLR) -o "@srcdir@/generated" "@srcdir@/cvc_lexer.g" -@srcdir@/generated/AntlrCvcLexer.cpp $(ANTLR_TOKEN_STUFF): @srcdir@/generated/AntlrCvcLexer.hpp -# doesn't actually depend on the lexer, but if we're doing parallel +@srcdir@/generated/CvcLexer.h: Cvc.g @srcdir@/stamp-generated + -rm -f $(ANTLR_STUFF) + $(ANTLR) -o "@srcdir@/generated" "@srcdir@/Cvc.g" + +# These don't actually depend on CvcLexer.h, but if we're doing parallel # make and the lexer needs to be rebuilt, we have to keep the rules # from running in parallel (since the token files will be deleted & # recreated) -@srcdir@/generated/AntlrCvcParser.hpp: cvc_parser.g cvc_lexer.g $(ANTLR_TOKEN_STUFF) @srcdir@/stamp-generated - $(AM_V_at)-rm -f $(ANTLR_PARSER_STUFF) - $(AM_V_GEN)$(ANTLR) -o "@srcdir@/generated" "@srcdir@/cvc_parser.g" -@srcdir@/generated/AntlrCvcParser.cpp: @srcdir@/generated/AntlrCvcParser.hpp +@srcdir@/generated/CvcLexer.c @srcdir@/generated/CvcParser.h @srcdir@/generated/CvcParser.c $(ANTLR_TOKEN_STUFF): @srcdir@/generated/CvcLexer.h -- cgit v1.2.3