"make dist" fixes; a distribution tarball can now build and pass tests. "make distche...

diff --git a/Makefile.am b/Makefile.am
index aa2d5fdcf0787608e1db3cdb7321594b95349be1..e482638d3e03edff0ca4befd7c412924f61ad769 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,14 +89,6 @@ EXTRA_DIST = \
        Makefile.builds.in \
        Makefile.subdir \
        config/build-type \
-       config/mkbuilddir \
-       contrib/addsourcedir \
-       contrib/code-checker \
-       contrib/configure-in-place \
-       contrib/cvc-devel.el \
-       contrib/cvc-mode.el \
-       contrib/dimacs_to_smt.pl \
-       contrib/editing-with-emacs \
-       contrib/switch-config
+       config/mkbuilddir
 dist-hook:
        cp -p "$(srcdir)/Makefile" "$(distdir)/Makefile"

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 952fde6edc296ea6c3e76475c22b77a668db6047..1dd5c8ded7d318b9ff89840a4c65a45731a159c1 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1 +1,9 @@
-EXTRA_DIST = README
+EXTRA_DIST = \
+       README \
+       cvc-devel.el \
+       dimacs_to_smt.pl \
+       switch-config \
+       cvc-mode.el \
+       editing-with-emacs \
+       configure-in-place \
+       depgraph

diff --git a/src/Makefile.am b/src/Makefile.am
index 944600c818a8b0ee38662527408061b9b0624310..a46f56598b8015efb2f98eb1441f1ef84dc51594 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -70,6 +70,7 @@ install-data-local: $(publicheaders)
 
 uninstall-local:
        @for f in $(publicheaders); do \
-               rm -f "$(DESTDIR)/$(includedir)/cvc4/$$f"
+               f=`echo "$$f" | sed 's,.*/,,'`; \
+               rm -f "$(DESTDIR)$(includedir)/cvc4/$$f"; \
        done
-       rmdir "$(DESTDIR)/$(includedir)/cvc4"
+       @rmdir "$(DESTDIR)$(includedir)/cvc4"

diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am
index a621441e16b43a09028b08a5a9b5c9ecac84dd35..9ec8774f034389f2c6f690457f84a983ae790253 100644 (file)
--- a/src/parser/Makefile.am
+++ b/src/parser/Makefile.am
@@ -71,6 +71,5 @@ libcvc4parser_noinst_la_SOURCES = \
        parser.cpp \
        parser_builder.h \
        parser_builder.cpp \
-       parser_options.h \
        parser_exception.h
 

diff --git a/src/prop/minisat/Makefile.am b/src/prop/minisat/Makefile.am
index 3d7bb08dfba93d7773780795631f2741720a3c93..b320d9584c50f3f33de8f49ec58ebd438b402a82 100644 (file)
--- a/src/prop/minisat/Makefile.am
+++ b/src/prop/minisat/Makefile.am
@@ -21,8 +21,8 @@ libminisat_la_SOURCES = \
        mtl/Queue.h \
        mtl/Sort.h \
        mtl/Vec.h \
-       mtl/Xalloc.h \
-       util/Options.h 
+       mtl/XAlloc.h \
+       utils/Options.h 
 
 EXTRA_DIST = \
        core/Main.cc \
@@ -34,6 +34,7 @@ EXTRA_DIST = \
        LICENSE \
        mtl/config.mk \
        mtl/template.mk \
+       utils/Options.cc \
        utils/ParseUtils.h \
        utils/System.h \
        utils/System.cc \

diff --git a/src/smt/Makefile.am b/src/smt/Makefile.am
index 8878448d533b28e7eec08e54d643a9ae3f08658d..2f9f08302707791e72fbf3ca855000638bf781a7 100644 (file)
--- a/src/smt/Makefile.am
+++ b/src/smt/Makefile.am
@@ -8,7 +8,6 @@ noinst_LTLIBRARIES = libsmt.la
 libsmt_la_SOURCES = \
        smt_engine.cpp \
        smt_engine.h \
-       noninteractive_exception.h \
+       modal_exception.h \
        bad_option_exception.h \
-       no_such_function_exception.h \
-       options.h
+       no_such_function_exception.h