fixes to some *clean targets

6 files changed, 30 insertions, 25 deletions

diff --git a/src/options/Makefile.am b/src/options/Makefile.am
index 1f4e991a5..2db54a4d9 100644
--- a/src/options/Makefile.am
+++ b/src/options/Makefile.am
@@ -118,13 +118,13 @@ options_holder.h options.cpp ../smt/smt_options.cpp base_options.cpp base_option
 options-stamp: options_holder_template.h options_template.cpp ../smt/smt_options_template.cpp base_options_template.h base_options_template.cpp mkoptions $(OPTIONS_FILES:%=../%)
 	$(AM_V_at)chmod +x @srcdir@/mkoptions
 	$(AM_V_GEN)(@srcdir@/mkoptions \
-		@srcdir@/options_holder_template.h @srcdir@/options_holder.h \
-		@srcdir@/options_template.cpp @srcdir@/options.cpp \
-		@srcdir@/../smt/smt_options_template.cpp @srcdir@/../smt/smt_options.cpp \
+		@srcdir@/options_holder_template.h @builddir@/options_holder.h \
+		@srcdir@/options_template.cpp @builddir@/options.cpp \
+		@srcdir@/../smt/smt_options_template.cpp @builddir@/../smt/smt_options.cpp \
 		@top_builddir@/doc/cvc4.1_template @top_builddir@/doc/cvc4.1 \
 		-t \
 		@srcdir@/base_options_template.h @srcdir@/base_options_template.cpp \
-		$(foreach o,$(OPTIONS_FILES),"$(srcdir)/../$(o)" "$(dir $(srcdir)/../$(o))") \
+		$(foreach o,$(OPTIONS_FILES),"$(srcdir)/../$(o)" "$(dir $(builddir)/../$(o))") \
 	)
 	touch "$@"
 
diff --git a/src/parser/cvc/Makefile.am b/src/parser/cvc/Makefile.am
index e5666b702..98fa80608 100644
--- a/src/parser/cvc/Makefile.am
+++ b/src/parser/cvc/Makefile.am
@@ -17,28 +17,28 @@ noinst_LTLIBRARIES = libparsercvc.la
 ANTLR_TOKEN_STUFF = \
 	generated/Cvc.tokens
 ANTLR_LEXER_STUFF = \
-    generated/CvcLexer.h \
-    generated/CvcLexer.c \
-    $(ANTLR_TOKEN_STUFF)
+	generated/CvcLexer.h \
+	generated/CvcLexer.c \
+	$(ANTLR_TOKEN_STUFF)
 ANTLR_PARSER_STUFF = \
-    generated/CvcParser.h \
-    generated/CvcParser.c
+	generated/CvcParser.h \
+	generated/CvcParser.c
 ANTLR_STUFF = \
-    $(ANTLR_LEXER_STUFF) \
-    $(ANTLR_PARSER_STUFF)
+	$(ANTLR_LEXER_STUFF) \
+	$(ANTLR_PARSER_STUFF)
 
 libparsercvc_la_SOURCES = \
-    Cvc.g \
-    cvc_input.h \
-    cvc_input.cpp \
-    $(ANTLR_STUFF)
+	Cvc.g \
+	cvc_input.h \
+	cvc_input.cpp \
+	$(ANTLR_STUFF)
 
 BUILT_SOURCES = $(ANTLR_STUFF) stamp-generated
 
 EXTRA_DIST = README
 
-MAINTAINERCLEANFILES = $(ANTLR_STUFF)
-maintainer-clean-local:
+DISTCLEANFILES = $(ANTLR_STUFF)
+distclean-local:
 	-$(AM_V_at)rmdir generated
 	-$(AM_V_at)rm -f stamp-generated
 
diff --git a/src/parser/smt/Makefile.am b/src/parser/smt/Makefile.am
index a74a6909c..773b42bb4 100644
--- a/src/parser/smt/Makefile.am
+++ b/src/parser/smt/Makefile.am
@@ -37,8 +37,8 @@ libparsersmt_la_SOURCES = \
 
 BUILT_SOURCES = $(ANTLR_STUFF) stamp-generated
 
-MAINTAINERCLEANFILES = $(ANTLR_STUFF)
-maintainer-clean-local:
+DISTCLEANFILES = $(ANTLR_STUFF)
+distclean-local:
 	-$(AM_V_at)rmdir generated
 	-$(AM_V_at)rm -f stamp-generated
 
diff --git a/src/parser/smt2/Makefile.am b/src/parser/smt2/Makefile.am
index 8f7bf433c..6e4a48d7e 100644
--- a/src/parser/smt2/Makefile.am
+++ b/src/parser/smt2/Makefile.am
@@ -37,8 +37,8 @@ libparsersmt2_la_SOURCES = \
 
 BUILT_SOURCES = $(ANTLR_STUFF) stamp-generated
 
-MAINTAINERCLEANFILES = $(ANTLR_STUFF)
-maintainer-clean-local:
+DISTCLEANFILES = $(ANTLR_STUFF)
+distclean-local:
 	-$(AM_V_at)rmdir generated
 	-$(AM_V_at)rm -f stamp-generated
 
diff --git a/src/parser/tptp/Makefile.am b/src/parser/tptp/Makefile.am
index 3113a523c..4b0c82c61 100644
--- a/src/parser/tptp/Makefile.am
+++ b/src/parser/tptp/Makefile.am
@@ -37,8 +37,8 @@ libparsertptp_la_SOURCES = \
 
 BUILT_SOURCES = $(ANTLR_STUFF) stamp-generated
 
-MAINTAINERCLEANFILES = $(ANTLR_STUFF)
-maintainer-clean-local:
+DISTCLEANFILES = $(ANTLR_STUFF)
+distclean-local:
 	-$(AM_V_at)rmdir generated
 	-$(AM_V_at)rm -f stamp-generated
 
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 7f469c68b..c3b3d8438 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -178,5 +178,10 @@ DISTCLEANFILES = \
 	tls.h.tmp \
 	integer.h \
 	rational.h \
-	tls.h
-
+	tls.h \
+	Debug_tags.tmp \
+	Debug_tags.h \
+	Debug_tags \
+	Trace_tags.tmp \
+	Trace_tags.h \
+	Trace_tags