diff options
author | Tim King <taking@google.com> | 2015-12-03 13:54:15 -0800 |
---|---|---|
committer | Tim King <taking@google.com> | 2015-12-03 15:24:27 -0800 |
commit | 49bb2a27ec4b41c96fc3881f9a6d06c1ad17e180 (patch) | |
tree | 7af025c3442d90348f8f867cd53533741afcb1a3 /src/parser/cvc | |
parent | 507f14eef40b17c06db6f2e286786afeea95acda (diff) |
Removing the generated directory from the parsers.
Diffstat (limited to 'src/parser/cvc')
-rw-r--r-- | src/parser/cvc/Makefile.am | 26 | ||||
-rw-r--r-- | src/parser/cvc/cvc_input.cpp | 4 | ||||
-rw-r--r-- | src/parser/cvc/cvc_input.h | 4 |
3 files changed, 17 insertions, 17 deletions
diff --git a/src/parser/cvc/Makefile.am b/src/parser/cvc/Makefile.am index b7066dd7e..8f084ba34 100644 --- a/src/parser/cvc/Makefile.am +++ b/src/parser/cvc/Makefile.am @@ -15,14 +15,14 @@ ANTLR_OPTS = noinst_LTLIBRARIES = libparsercvc.la ANTLR_TOKEN_STUFF = \ - generated/Cvc.tokens + @builddir@/Cvc.tokens ANTLR_LEXER_STUFF = \ - generated/CvcLexer.h \ - generated/CvcLexer.c \ + @builddir@/CvcLexer.h \ + @builddir@/CvcLexer.c \ $(ANTLR_TOKEN_STUFF) ANTLR_PARSER_STUFF = \ - generated/CvcParser.h \ - generated/CvcParser.c + @builddir@/CvcParser.h \ + @builddir@/CvcParser.c ANTLR_STUFF = \ $(ANTLR_LEXER_STUFF) \ $(ANTLR_PARSER_STUFF) @@ -34,11 +34,11 @@ libparsercvc_la_SOURCES = \ $(ANTLR_STUFF) BUILT_SOURCES = \ - generated/Cvc.tokens \ - generated/CvcLexer.h \ - generated/CvcLexer.c \ - generated/CvcParser.h \ - generated/CvcParser.c \ + @builddir@/Cvc.tokens \ + @builddir@/CvcLexer.h \ + @builddir@/CvcLexer.c \ + @builddir@/CvcParser.h \ + @builddir@/CvcParser.c \ stamp-generated EXTRA_DIST = \ @@ -55,13 +55,13 @@ stamp-generated: $(AM_V_at)touch stamp-generated # antlr doesn't overwrite output files, it just leaves them. So we have to delete them first. -generated/CvcLexer.h: Cvc.g stamp-generated +@builddir@/CvcLexer.h: Cvc.g stamp-generated -$(AM_V_at)rm -f $(ANTLR_STUFF) @if test -z "$(ANTLR)"; then echo "ERROR: antlr parser generator cannot be found, cannot generate the parser" >&2; exit 1; fi - $(AM_V_GEN)$(ANTLR) $(ANTLR_OPTS) -fo "generated" "@srcdir@/Cvc.g" + $(AM_V_GEN)$(ANTLR) $(ANTLR_OPTS) -fo "@builddir@" "@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) -generated/CvcLexer.c generated/CvcParser.h generated/CvcParser.c $(ANTLR_TOKEN_STUFF): generated/CvcLexer.h +@builddir@/CvcLexer.c @builddir@/CvcParser.h @builddir@/CvcParser.c $(ANTLR_TOKEN_STUFF): @builddir@/CvcLexer.h diff --git a/src/parser/cvc/cvc_input.cpp b/src/parser/cvc/cvc_input.cpp index 38c33d007..69920403f 100644 --- a/src/parser/cvc/cvc_input.cpp +++ b/src/parser/cvc/cvc_input.cpp @@ -20,8 +20,8 @@ #include "parser/antlr_input.h" #include "parser/parser_exception.h" #include "parser/cvc/cvc_input.h" -#include "parser/cvc/generated/CvcLexer.h" -#include "parser/cvc/generated/CvcParser.h" +#include "parser/cvc/CvcLexer.h" +#include "parser/cvc/CvcParser.h" namespace CVC4 { namespace parser { diff --git a/src/parser/cvc/cvc_input.h b/src/parser/cvc/cvc_input.h index 46851bfd3..a88fd7223 100644 --- a/src/parser/cvc/cvc_input.h +++ b/src/parser/cvc/cvc_input.h @@ -20,8 +20,8 @@ #define __CVC4__PARSER__CVC_INPUT_H #include "parser/antlr_input.h" -#include "parser/cvc/generated/CvcLexer.h" -#include "parser/cvc/generated/CvcParser.h" +#include "parser/cvc/CvcLexer.h" +#include "parser/cvc/CvcParser.h" // extern void CvcParserSetAntlrParser(CVC4::parser::AntlrParser* newAntlrParser); |