fixes to some *clean targets

diff --git a/Makefile.am b/Makefile.am
index 6253f653b1e69292debb2521a01e3187a1a77fdd..c887b74b2e6e297af71f4f8cb25dea7fc27bc1ca 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,6 +130,7 @@ distclean-local:
 # these have .in versions
 DISTCLEANFILES = \
        doc/cvc4.1 \
+       doc/cvc4.1_template \
        doc/cvc4.5 \
        doc/libcvc4.3 \
        doc/libcvc4compat.3 \

diff --git a/src/options/Makefile.am b/src/options/Makefile.am
index 1f4e991a5564eb5d87570bb8f7c2752c89c9b8e8..2db54a4d94df33f281fe76636d237c782ac9c9c7 100644 (file)
--- 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 e5666b7023df1520a7c0aa5f2129f5f64167bbe0..98fa80608cc37eda9d5db5730a4d979866772739 100644 (file)
--- 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 a74a6909cd5eedffa5754d1c64f8f7f7ad93e378..773b42bb46b7ccba00ec0a3de8f04a1abe8344a2 100644 (file)
--- 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 8f7bf433cdc8409b08cba5b02777782f2a16cabc..6e4a48d7e83ea0db8a228456b0c9fd88c15a0ee5 100644 (file)
--- 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 3113a523c01a4ae2b8ddd0aa790047fcf798c2c3..4b0c82c6100d53d04ec4bc64c10d032dc45aa9b9 100644 (file)
--- 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 7f469c68b5f724d10585db157dc43aa55558d27a..c3b3d84388734dee5b7167d94421c5be9bc8a164 100644 (file)
--- 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

diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am
index 1ab00bf8d4f248ce72c95c902296b1e2f425f07e..5f5a1e75e978b1f7c46b1f1a02bd5058753c924f 100644 (file)
--- a/test/unit/Makefile.am
+++ b/test/unit/Makefile.am
@@ -104,6 +104,7 @@ EXTRA_DIST = \
        $(TEST_DEPS_DIST)
 
 MOSTLYCLEANFILES = $(UNIT_TESTS) $(UNIT_TESTS:%=%.cpp) $(UNIT_TESTS:%=%.lo)
+DISTCLEANFILES = $(UNIT_TESTS:%=.deps/%.Plo)
 
 # the tests automake infrastructure doesn't clean up .o files :-(
 # handle both .libs and _libs variants