better parser makefile fix

4 files changed, 56 insertions, 32 deletions

diff --git a/src/parser/cvc/Makefile.am b/src/parser/cvc/Makefile.am
index de4abc1e9..91533ca7b 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 = \
-	@abs_builddir@/generated/Cvc.tokens
+	generated/Cvc.tokens
 ANTLR_LEXER_STUFF = \
-	@abs_builddir@/generated/CvcLexer.h \
-	@abs_builddir@/generated/CvcLexer.c \
+	generated/CvcLexer.h \
+	generated/CvcLexer.c \
 	$(ANTLR_TOKEN_STUFF)
 ANTLR_PARSER_STUFF = \
-	@abs_builddir@/generated/CvcParser.h \
-	@abs_builddir@/generated/CvcParser.c
+	generated/CvcParser.h \
+	generated/CvcParser.c
 ANTLR_STUFF = \
 	$(ANTLR_LEXER_STUFF) \
 	$(ANTLR_PARSER_STUFF)
@@ -33,7 +33,13 @@ libparsercvc_la_SOURCES = \
 	cvc_input.cpp \
 	$(ANTLR_STUFF)
 
-BUILT_SOURCES = $(ANTLR_STUFF) stamp-generated
+BUILT_SOURCES = \
+	generated/Cvc.tokens \
+	generated/CvcLexer.h \
+	generated/CvcLexer.c \
+	generated/CvcParser.h \
+	generated/CvcParser.c \
+	stamp-generated
 
 EXTRA_DIST = README
 
@@ -47,7 +53,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.
-@abs_builddir@/generated/CvcLexer.h: Cvc.g stamp-generated
+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 +62,4 @@ 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)
-@abs_builddir@/generated/CvcLexer.c @abs_builddir@/generated/CvcParser.h @abs_builddir@/generated/CvcParser.c $(ANTLR_TOKEN_STUFF): @abs_builddir@/generated/CvcLexer.h
+generated/CvcLexer.c generated/CvcParser.h generated/CvcParser.c $(ANTLR_TOKEN_STUFF): generated/CvcLexer.h
diff --git a/src/parser/smt/Makefile.am b/src/parser/smt/Makefile.am
index 4879f0c4b..ffc5397c7 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 = \
-	@abs_builddir@/generated/Smt.tokens
+	generated/Smt.tokens
 ANTLR_LEXER_STUFF = \
-	@abs_builddir@/generated/SmtLexer.h \
-	@abs_builddir@/generated/SmtLexer.c \
+	generated/SmtLexer.h \
+	generated/SmtLexer.c \
 	$(ANTLR_TOKEN_STUFF)
 ANTLR_PARSER_STUFF = \
-	@abs_builddir@/generated/SmtParser.h \
-	@abs_builddir@/generated/SmtParser.c
+	generated/SmtParser.h \
+	generated/SmtParser.c
 ANTLR_STUFF = \
 	$(ANTLR_LEXER_STUFF) \
 	$(ANTLR_PARSER_STUFF)
@@ -35,7 +35,13 @@ libparsersmt_la_SOURCES = \
 	smt_input.cpp \
 	$(ANTLR_STUFF)
 
-BUILT_SOURCES = $(ANTLR_STUFF) stamp-generated
+BUILT_SOURCES = \
+	generated/Smt.tokens \
+	generated/SmtLexer.h \
+	generated/SmtLexer.c \
+	generated/SmtParser.h \
+	generated/SmtParser.c \
+	stamp-generated
 
 DISTCLEANFILES = $(ANTLR_STUFF)
 distclean-local:
@@ -47,7 +53,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.
-@abs_builddir@/generated/SmtLexer.h: Smt.g stamp-generated
+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 +62,4 @@ 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)
-@abs_builddir@/generated/SmtLexer.c @abs_builddir@/generated/SmtParser.h @abs_builddir@/generated/SmtParser.c $(ANTLR_TOKEN_STUFF): @abs_builddir@/generated/SmtLexer.h
+generated/SmtLexer.c generated/SmtParser.h generated/SmtParser.c $(ANTLR_TOKEN_STUFF): generated/SmtLexer.h
diff --git a/src/parser/smt2/Makefile.am b/src/parser/smt2/Makefile.am
index 94cf07c42..f55fe75cb 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 = \
-	@abs_builddir@/generated/Smt2.tokens
+	generated/Smt2.tokens
 ANTLR_LEXER_STUFF = \
-	@abs_builddir@/generated/Smt2Lexer.h \
-	@abs_builddir@/generated/Smt2Lexer.c \
+	generated/Smt2Lexer.h \
+	generated/Smt2Lexer.c \
 	$(ANTLR_TOKEN_STUFF)
 ANTLR_PARSER_STUFF = \
-	@abs_builddir@/generated/Smt2Parser.h \
-	@abs_builddir@/generated/Smt2Parser.c
+	generated/Smt2Parser.h \
+	generated/Smt2Parser.c
 ANTLR_STUFF = \
 	$(ANTLR_LEXER_STUFF) \
 	$(ANTLR_PARSER_STUFF)
@@ -35,7 +35,13 @@ libparsersmt2_la_SOURCES = \
 	smt2_input.cpp \
 	$(ANTLR_STUFF)
 
-BUILT_SOURCES = $(ANTLR_STUFF) stamp-generated
+BUILT_SOURCES = \
+	generated/Smt2.tokens \
+	generated/Smt2Lexer.h \
+	generated/Smt2Lexer.c \
+	generated/Smt2Parser.h \
+	generated/Smt2Parser.c \
+	stamp-generated
 
 DISTCLEANFILES = $(ANTLR_STUFF)
 distclean-local:
@@ -47,7 +53,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.
-@abs_builddir@/generated/Smt2Lexer.h: Smt2.g stamp-generated
+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 +62,4 @@ 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)
-@abs_builddir@/generated/Smt2Lexer.c @abs_builddir@/generated/Smt2Parser.h @abs_builddir@/generated/Smt2Parser.c $(ANTLR_TOKEN_STUFF): @abs_builddir@/generated/Smt2Lexer.h
+generated/Smt2Lexer.c generated/Smt2Parser.h generated/Smt2Parser.c $(ANTLR_TOKEN_STUFF): generated/Smt2Lexer.h
diff --git a/src/parser/tptp/Makefile.am b/src/parser/tptp/Makefile.am
index 6008f7da2..fa677d6c0 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 = \
-	@abs_builddir@/generated/Tptp.tokens
+	generated/Tptp.tokens
 ANTLR_LEXER_STUFF = \
-	@abs_builddir@/generated/TptpLexer.h \
-	@abs_builddir@/generated/TptpLexer.c \
+	generated/TptpLexer.h \
+	generated/TptpLexer.c \
 	$(ANTLR_TOKEN_STUFF)
 ANTLR_PARSER_STUFF = \
-	@abs_builddir@/generated/TptpParser.h \
-	@abs_builddir@/generated/TptpParser.c
+	generated/TptpParser.h \
+	generated/TptpParser.c
 ANTLR_STUFF = \
 	$(ANTLR_LEXER_STUFF) \
 	$(ANTLR_PARSER_STUFF)
@@ -35,7 +35,13 @@ libparsertptp_la_SOURCES = \
 	tptp_input.cpp \
 	$(ANTLR_STUFF)
 
-BUILT_SOURCES = $(ANTLR_STUFF) stamp-generated
+BUILT_SOURCES = \
+	generated/Tptp.tokens \
+	generated/TptpLexer.h \
+	generated/TptpLexer.c \
+	generated/TptpParser.h \
+	generated/TptpParser.c \
+	stamp-generated
 
 DISTCLEANFILES = $(ANTLR_STUFF)
 distclean-local:
@@ -47,7 +53,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.
-@abs_builddir@/generated/TptpLexer.h: Tptp.g stamp-generated
+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 +62,4 @@ 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)
-@abs_builddir@/generated/TptpLexer.c @abs_builddir@/generated/TptpParser.h @abs_builddir@/generated/TptpParser.c $(ANTLR_TOKEN_STUFF): @abs_builddir@/generated/TptpLexer.h
+generated/TptpLexer.c generated/TptpParser.h generated/TptpParser.c $(ANTLR_TOKEN_STUFF): generated/TptpLexer.h