diff options
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | contrib/Makefile.am | 10 | ||||
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/parser/Makefile.am | 1 | ||||
| -rw-r--r-- | src/prop/minisat/Makefile.am | 5 | ||||
| -rw-r--r-- | src/smt/Makefile.am | 5 |
6 files changed, 18 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index aa2d5fdcf..e482638d3 100644 --- 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 952fde6ed..1dd5c8ded 100644 --- 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 944600c81..a46f56598 100644 --- 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 a621441e1..9ec8774f0 100644 --- 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 3d7bb08df..b320d9584 100644 --- 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 8878448d5..2f9f08302 100644 --- 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 |