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/smt2 | |
parent | 507f14eef40b17c06db6f2e286786afeea95acda (diff) |
Removing the generated directory from the parsers.
Diffstat (limited to 'src/parser/smt2')
-rw-r--r-- | src/parser/smt2/Makefile.am | 26 | ||||
-rw-r--r-- | src/parser/smt2/smt2_input.cpp | 4 | ||||
-rw-r--r-- | src/parser/smt2/smt2_input.h | 4 | ||||
-rw-r--r-- | src/parser/smt2/sygus_input.cpp | 4 | ||||
-rw-r--r-- | src/parser/smt2/sygus_input.h | 4 |
5 files changed, 21 insertions, 21 deletions
diff --git a/src/parser/smt2/Makefile.am b/src/parser/smt2/Makefile.am index 38de258cc..fece5e5e8 100644 --- a/src/parser/smt2/Makefile.am +++ b/src/parser/smt2/Makefile.am @@ -15,14 +15,14 @@ ANTLR_OPTS = noinst_LTLIBRARIES = libparsersmt2.la ANTLR_TOKEN_STUFF = \ - generated/Smt2.tokens + @builddir@/Smt2.tokens ANTLR_LEXER_STUFF = \ - generated/Smt2Lexer.h \ - generated/Smt2Lexer.c \ + @builddir@/Smt2Lexer.h \ + @builddir@/Smt2Lexer.c \ $(ANTLR_TOKEN_STUFF) ANTLR_PARSER_STUFF = \ - generated/Smt2Parser.h \ - generated/Smt2Parser.c + @builddir@/Smt2Parser.h \ + @builddir@/Smt2Parser.c ANTLR_STUFF = \ $(ANTLR_LEXER_STUFF) \ $(ANTLR_PARSER_STUFF) @@ -38,11 +38,11 @@ libparsersmt2_la_SOURCES = \ $(ANTLR_STUFF) BUILT_SOURCES = \ - generated/Smt2.tokens \ - generated/Smt2Lexer.h \ - generated/Smt2Lexer.c \ - generated/Smt2Parser.h \ - generated/Smt2Parser.c \ + @builddir@/Smt2.tokens \ + @builddir@/Smt2Lexer.h \ + @builddir@/Smt2Lexer.c \ + @builddir@/Smt2Parser.h \ + @builddir@/Smt2Parser.c \ stamp-generated EXTRA_DIST = \ @@ -58,13 +58,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/Smt2Lexer.h: Smt2.g stamp-generated +@builddir@/Smt2Lexer.h: Smt2.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@/Smt2.g" + $(AM_V_GEN)$(ANTLR) $(ANTLR_OPTS) -fo "@builddir@" "@srcdir@/Smt2.g" # These don't actually depend on SmtLexer.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/Smt2Lexer.c generated/Smt2Parser.h generated/Smt2Parser.c $(ANTLR_TOKEN_STUFF): generated/Smt2Lexer.h +@builddir@/Smt2Lexer.c @builddir@/Smt2Parser.h @builddir@/Smt2Parser.c $(ANTLR_TOKEN_STUFF): @builddir@/Smt2Lexer.h diff --git a/src/parser/smt2/smt2_input.cpp b/src/parser/smt2/smt2_input.cpp index 22c2fd9a7..9f1fae16f 100644 --- a/src/parser/smt2/smt2_input.cpp +++ b/src/parser/smt2/smt2_input.cpp @@ -22,8 +22,8 @@ #include "parser/parser.h" #include "parser/parser_exception.h" #include "parser/smt2/smt2.h" -#include "parser/smt2/generated/Smt2Lexer.h" -#include "parser/smt2/generated/Smt2Parser.h" +#include "parser/smt2/Smt2Lexer.h" +#include "parser/smt2/Smt2Parser.h" namespace CVC4 { namespace parser { diff --git a/src/parser/smt2/smt2_input.h b/src/parser/smt2/smt2_input.h index a1baa98cb..0eb4a504b 100644 --- a/src/parser/smt2/smt2_input.h +++ b/src/parser/smt2/smt2_input.h @@ -20,8 +20,8 @@ #define __CVC4__PARSER__SMT2_INPUT_H #include "parser/antlr_input.h" -#include "parser/smt2/generated/Smt2Lexer.h" -#include "parser/smt2/generated/Smt2Parser.h" +#include "parser/smt2/Smt2Lexer.h" +#include "parser/smt2/Smt2Parser.h" // extern void Smt2ParserSetAntlrParser(CVC4::parser::AntlrParser* newAntlrParser); diff --git a/src/parser/smt2/sygus_input.cpp b/src/parser/smt2/sygus_input.cpp index 8bd02485b..086a04d27 100644 --- a/src/parser/smt2/sygus_input.cpp +++ b/src/parser/smt2/sygus_input.cpp @@ -22,8 +22,8 @@ #include "parser/parser.h" #include "parser/parser_exception.h" #include "parser/smt2/sygus_input.h" -#include "parser/smt2/generated/Smt2Lexer.h" -#include "parser/smt2/generated/Smt2Parser.h" +#include "parser/smt2/Smt2Lexer.h" +#include "parser/smt2/Smt2Parser.h" namespace CVC4 { namespace parser { diff --git a/src/parser/smt2/sygus_input.h b/src/parser/smt2/sygus_input.h index d5e6b8b87..1f0078076 100644 --- a/src/parser/smt2/sygus_input.h +++ b/src/parser/smt2/sygus_input.h @@ -20,8 +20,8 @@ #define __CVC4__PARSER__SYGUS_INPUT_H #include "parser/antlr_input.h" -#include "parser/smt2/generated/Smt2Lexer.h" -#include "parser/smt2/generated/Smt2Parser.h" +#include "parser/smt2/Smt2Lexer.h" +#include "parser/smt2/Smt2Parser.h" // extern void Smt2ParserSetAntlrParser(CVC4::parser::AntlrParser* newAntlrParser); |