diff options
| author | Morgan Deters <mdeters@gmail.com> | 2010-11-15 20:08:17 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2010-11-15 20:08:17 +0000 |
| commit | 80596bc6e2a4aba6c14d408a41a214579b636f03 (patch) | |
| tree | 17a09dc22f5bf10c7008e0b8467052ae92112149 /src | |
| parent | 0eb2a0362fee06023f0668e94bb566b69f4a7cda (diff) | |
fix some things with the build system (make dist, make install, make check)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 12 | ||||
| -rw-r--r-- | src/theory/Makefile.am | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a46f56598..069a446e6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,7 +17,7 @@ AM_CPPFLAGS = \ -I@srcdir@/include -I@srcdir@ -I@builddir@ AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -SUBDIRS = lib expr util context theory prop smt . parser main +SUBDIRS = lib expr util context theory prop smt printer . parser main lib_LTLIBRARIES = libcvc4.la noinst_LTLIBRARIES = libcvc4_noinst.la @@ -62,15 +62,15 @@ publicheaders = \ include/cvc4parser_public.h install-data-local: $(publicheaders) - $(mkinstalldirs) $(DESTDIR)$(includedir)/cvc4 + $(mkinstalldirs) $(DESTDIR)$(prefix)$(includedir)/cvc4 @for f in $(publicheaders); do \ - echo $(INSTALL_DATA) "$(srcdir)/$$f" "$(DESTDIR)/$(includedir)/cvc4"; \ - $(INSTALL_DATA) "$(srcdir)/$$f" "$(DESTDIR)/$(includedir)/cvc4"; \ + echo $(INSTALL_DATA) "$(srcdir)/$$f" "$(DESTDIR)$(prefix)$(includedir)/cvc4"; \ + $(INSTALL_DATA) "$(srcdir)/$$f" "$(DESTDIR)$(prefix)$(includedir)/cvc4"; \ done uninstall-local: @for f in $(publicheaders); do \ f=`echo "$$f" | sed 's,.*/,,'`; \ - rm -f "$(DESTDIR)$(includedir)/cvc4/$$f"; \ + rm -f "$(DESTDIR)$(prefix)$(includedir)/cvc4/$$f"; \ done - @rmdir "$(DESTDIR)$(includedir)/cvc4" + @rmdir "$(DESTDIR)$(prefix)$(includedir)/cvc4" diff --git a/src/theory/Makefile.am b/src/theory/Makefile.am index c82968ef6..639e9eb4c 100644 --- a/src/theory/Makefile.am +++ b/src/theory/Makefile.am @@ -3,6 +3,8 @@ AM_CPPFLAGS = \ -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) +SUBDIRS = builtin booleans uf arith arrays bv + noinst_LTLIBRARIES = libtheory.la libtheory_la_SOURCES = \ @@ -48,5 +50,3 @@ theoryof_table.h: theoryof_table_template.h mktheoryof @top_builddir@/src/theory $< \ `cat @top_builddir@/src/theory/.subdirs` \ > $@) || (rm -f $@ && exit 1) - -SUBDIRS = builtin booleans uf arith arrays bv |