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/smt1 | |
parent | 507f14eef40b17c06db6f2e286786afeea95acda (diff) |
Removing the generated directory from the parsers.
Diffstat (limited to 'src/parser/smt1')
-rw-r--r-- | src/parser/smt1/Makefile.am | 26 | ||||
-rw-r--r-- | src/parser/smt1/smt1_input.cpp | 4 | ||||
-rw-r--r-- | src/parser/smt1/smt1_input.h | 4 |
3 files changed, 17 insertions, 17 deletions
diff --git a/src/parser/smt1/Makefile.am b/src/parser/smt1/Makefile.am index 90ee7eb31..ae49d0659 100644 --- a/src/parser/smt1/Makefile.am +++ b/src/parser/smt1/Makefile.am @@ -15,14 +15,14 @@ ANTLR_OPTS = noinst_LTLIBRARIES = libparsersmt1.la ANTLR_TOKEN_STUFF = \ - generated/Smt1.tokens + @builddir@/Smt1.tokens ANTLR_LEXER_STUFF = \ - generated/Smt1Lexer.h \ - generated/Smt1Lexer.c \ + @builddir@/Smt1Lexer.h \ + @builddir@/Smt1Lexer.c \ $(ANTLR_TOKEN_STUFF) ANTLR_PARSER_STUFF = \ - generated/Smt1Parser.h \ - generated/Smt1Parser.c + @builddir@/Smt1Parser.h \ + @builddir@/Smt1Parser.c ANTLR_STUFF = \ $(ANTLR_LEXER_STUFF) \ $(ANTLR_PARSER_STUFF) @@ -36,11 +36,11 @@ libparsersmt1_la_SOURCES = \ $(ANTLR_STUFF) BUILT_SOURCES = \ - generated/Smt1.tokens \ - generated/Smt1Lexer.h \ - generated/Smt1Lexer.c \ - generated/Smt1Parser.h \ - generated/Smt1Parser.c \ + @builddir@/Smt1.tokens \ + @builddir@/Smt1Lexer.h \ + @builddir@/Smt1Lexer.c \ + @builddir@/Smt1Parser.h \ + @builddir@/Smt1Parser.c \ stamp-generated EXTRA_DIST = \ @@ -56,13 +56,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/Smt1Lexer.h: Smt1.g stamp-generated +@builddir@/Smt1Lexer.h: Smt1.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@/Smt1.g" + $(AM_V_GEN)$(ANTLR) $(ANTLR_OPTS) -fo "@builddir@" "@srcdir@/Smt1.g" # These don't actually depend on Smt1Lexer.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/Smt1Lexer.c generated/Smt1Parser.h generated/Smt1Parser.c $(ANTLR_TOKEN_STUFF): generated/Smt1Lexer.h +@builddir@/Smt1Lexer.c @builddir@/Smt1Parser.h @builddir@/Smt1Parser.c $(ANTLR_TOKEN_STUFF): @builddir@/Smt1Lexer.h diff --git a/src/parser/smt1/smt1_input.cpp b/src/parser/smt1/smt1_input.cpp index 6ac897078..1391c7e85 100644 --- a/src/parser/smt1/smt1_input.cpp +++ b/src/parser/smt1/smt1_input.cpp @@ -21,8 +21,8 @@ #include "parser/input.h" #include "parser/parser.h" #include "parser/parser_exception.h" -#include "parser/smt1/generated/Smt1Lexer.h" -#include "parser/smt1/generated/Smt1Parser.h" +#include "parser/smt1/Smt1Lexer.h" +#include "parser/smt1/Smt1Parser.h" namespace CVC4 { namespace parser { diff --git a/src/parser/smt1/smt1_input.h b/src/parser/smt1/smt1_input.h index 0e95c192a..de21036c0 100644 --- a/src/parser/smt1/smt1_input.h +++ b/src/parser/smt1/smt1_input.h @@ -20,8 +20,8 @@ #define __CVC4__PARSER__SMT1_INPUT_H #include "parser/antlr_input.h" -#include "parser/smt1/generated/Smt1Lexer.h" -#include "parser/smt1/generated/Smt1Parser.h" +#include "parser/smt1/Smt1Lexer.h" +#include "parser/smt1/Smt1Parser.h" // extern void Smt1ParserSetAntlrParser(CVC4::parser::AntlrParser* newAntlrParser); |