From 08afbc4817c5410961ce3a69534b9e270364a37b Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Thu, 2 Aug 2012 23:55:08 +0000 Subject: [PATCH] fixes to paths in parser makefiles; if you've noticed strange SMT2 parser behavior the last couple days, this should fix it --- src/parser/cvc/Makefile.am | 14 +++++++------- src/parser/smt/Makefile.am | 14 +++++++------- src/parser/smt2/Makefile.am | 14 +++++++------- src/parser/tptp/Makefile.am | 14 +++++++------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/parser/cvc/Makefile.am b/src/parser/cvc/Makefile.am index 98fa80608..de4abc1e9 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 + @abs_builddir@/generated/Cvc.tokens ANTLR_LEXER_STUFF = \ - generated/CvcLexer.h \ - generated/CvcLexer.c \ + @abs_builddir@/generated/CvcLexer.h \ + @abs_builddir@/generated/CvcLexer.c \ $(ANTLR_TOKEN_STUFF) ANTLR_PARSER_STUFF = \ - generated/CvcParser.h \ - generated/CvcParser.c + @abs_builddir@/generated/CvcParser.h \ + @abs_builddir@/generated/CvcParser.c ANTLR_STUFF = \ $(ANTLR_LEXER_STUFF) \ $(ANTLR_PARSER_STUFF) @@ -47,7 +47,7 @@ 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 +@abs_builddir@/generated/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" @@ -56,4 +56,4 @@ generated/CvcLexer.h: Cvc.g stamp-generated # 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 +@abs_builddir@/generated/CvcLexer.c @abs_builddir@/generated/CvcParser.h @abs_builddir@/generated/CvcParser.c $(ANTLR_TOKEN_STUFF): @abs_builddir@/generated/CvcLexer.h diff --git a/src/parser/smt/Makefile.am b/src/parser/smt/Makefile.am index 773b42bb4..4879f0c4b 100644 --- a/src/parser/smt/Makefile.am +++ b/src/parser/smt/Makefile.am @@ -15,14 +15,14 @@ ANTLR_OPTS = noinst_LTLIBRARIES = libparsersmt.la ANTLR_TOKEN_STUFF = \ - generated/Smt.tokens + @abs_builddir@/generated/Smt.tokens ANTLR_LEXER_STUFF = \ - generated/SmtLexer.h \ - generated/SmtLexer.c \ + @abs_builddir@/generated/SmtLexer.h \ + @abs_builddir@/generated/SmtLexer.c \ $(ANTLR_TOKEN_STUFF) ANTLR_PARSER_STUFF = \ - generated/SmtParser.h \ - generated/SmtParser.c + @abs_builddir@/generated/SmtParser.h \ + @abs_builddir@/generated/SmtParser.c ANTLR_STUFF = \ $(ANTLR_LEXER_STUFF) \ $(ANTLR_PARSER_STUFF) @@ -47,7 +47,7 @@ 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/SmtLexer.h: Smt.g stamp-generated +@abs_builddir@/generated/SmtLexer.h: Smt.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@/Smt.g" @@ -56,4 +56,4 @@ generated/SmtLexer.h: Smt.g stamp-generated # 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/SmtLexer.c generated/SmtParser.h generated/SmtParser.c $(ANTLR_TOKEN_STUFF): generated/SmtLexer.h +@abs_builddir@/generated/SmtLexer.c @abs_builddir@/generated/SmtParser.h @abs_builddir@/generated/SmtParser.c $(ANTLR_TOKEN_STUFF): @abs_builddir@/generated/SmtLexer.h diff --git a/src/parser/smt2/Makefile.am b/src/parser/smt2/Makefile.am index 6e4a48d7e..94cf07c42 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 + @abs_builddir@/generated/Smt2.tokens ANTLR_LEXER_STUFF = \ - generated/Smt2Lexer.h \ - generated/Smt2Lexer.c \ + @abs_builddir@/generated/Smt2Lexer.h \ + @abs_builddir@/generated/Smt2Lexer.c \ $(ANTLR_TOKEN_STUFF) ANTLR_PARSER_STUFF = \ - generated/Smt2Parser.h \ - generated/Smt2Parser.c + @abs_builddir@/generated/Smt2Parser.h \ + @abs_builddir@/generated/Smt2Parser.c ANTLR_STUFF = \ $(ANTLR_LEXER_STUFF) \ $(ANTLR_PARSER_STUFF) @@ -47,7 +47,7 @@ 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 +@abs_builddir@/generated/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" @@ -56,4 +56,4 @@ generated/Smt2Lexer.h: Smt2.g stamp-generated # 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 +@abs_builddir@/generated/Smt2Lexer.c @abs_builddir@/generated/Smt2Parser.h @abs_builddir@/generated/Smt2Parser.c $(ANTLR_TOKEN_STUFF): @abs_builddir@/generated/Smt2Lexer.h diff --git a/src/parser/tptp/Makefile.am b/src/parser/tptp/Makefile.am index 4b0c82c61..6008f7da2 100644 --- a/src/parser/tptp/Makefile.am +++ b/src/parser/tptp/Makefile.am @@ -15,14 +15,14 @@ ANTLR_OPTS = noinst_LTLIBRARIES = libparsertptp.la ANTLR_TOKEN_STUFF = \ - generated/Tptp.tokens + @abs_builddir@/generated/Tptp.tokens ANTLR_LEXER_STUFF = \ - generated/TptpLexer.h \ - generated/TptpLexer.c \ + @abs_builddir@/generated/TptpLexer.h \ + @abs_builddir@/generated/TptpLexer.c \ $(ANTLR_TOKEN_STUFF) ANTLR_PARSER_STUFF = \ - generated/TptpParser.h \ - generated/TptpParser.c + @abs_builddir@/generated/TptpParser.h \ + @abs_builddir@/generated/TptpParser.c ANTLR_STUFF = \ $(ANTLR_LEXER_STUFF) \ $(ANTLR_PARSER_STUFF) @@ -47,7 +47,7 @@ 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/TptpLexer.h: Tptp.g stamp-generated +@abs_builddir@/generated/TptpLexer.h: Tptp.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@/Tptp.g" @@ -56,4 +56,4 @@ generated/TptpLexer.h: Tptp.g stamp-generated # 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/TptpLexer.c generated/TptpParser.h generated/TptpParser.c $(ANTLR_TOKEN_STUFF): generated/TptpLexer.h +@abs_builddir@/generated/TptpLexer.c @abs_builddir@/generated/TptpParser.h @abs_builddir@/generated/TptpParser.c $(ANTLR_TOKEN_STUFF): @abs_builddir@/generated/TptpLexer.h -- 2.30.2