missed files for the latter commit

[cvc5.git] / Makefile.builds.in

diff --git a/Makefile.builds.in b/Makefile.builds.in
index baf9237b21d08d330547b35a4ddd9c58c4870cd9..296e5a9746cc75c86edfff64d78a6892952a060c 100644 (file)
--- a/Makefile.builds.in
+++ b/Makefile.builds.in
@@ -33,6 +33,7 @@ libdir = @libdir@
 abs_builddir = @abs_builddir@
 distdir = @PACKAGE@-@VERSION@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+EXEEXT = @EXEEXT@
 SHELL = @SHELL@
 LIBTOOL = $(CURRENT_BUILD)/libtool
 
@@ -60,11 +61,11 @@ AM_V_mkdir = $(am__v_mkdir_$(V))
 am__v_mkdir_ = $(am__v_mkdir_$(AM_DEFAULT_VERBOSITY))
 am__v_mkdir_0 = @$(am__v_mkdir_noat_0)
 am__v_mkdir_1 = $(am__v_mkdir_noat_1)
-# libtool --mode=install install
+# libtool --mode=install $(install_sh)
 AM_V_ltinstall = $(am__v_ltinstall_$(V))
 am__v_ltinstall_ = $(am__v_ltinstall_$(AM_DEFAULT_VERBOSITY))
-am__v_ltinstall_0 = @$(SHELL) -c 'echo "   LTINS $$1"; $(LIBTOOL) --silent --mode=install install "$$@"' bash
-am__v_ltinstall_1 = $(LIBTOOL) --mode=install install
+am__v_ltinstall_0 = @$(SHELL) -c 'echo "   LTINS $$1"; $(LIBTOOL) --silent --mode=install $(install_sh) "$$@"' bash
+am__v_ltinstall_1 = $(LIBTOOL) --mode=install $(install_sh)
 # install_sh (never prefix with @)
 AM_V_install_sh_noat = $(am__v_install_sh_noat_$(V))
 am__v_install_sh_noat_ = $(am__v_install_sh_noat_$(AM_DEFAULT_VERBOSITY))
@@ -79,9 +80,9 @@ am__v_relink_1 = :
 # all the binaries that might need to be installed
 # (it's not a fatal error for one/some don't exist in a given build
 # configuration)
-CVC4_BINARIES = cvc4 pcvc4
+CVC4_BINARIES = cvc4$(EXEEXT) pcvc4$(EXEEXT)
 
-.PHONY: _default_build_ all
+.PHONY: _default_build_ all examples
 _default_build_: all
 all:
 #      build the current build profile
@@ -98,7 +99,7 @@ all:
                "$(abs_builddir)$(libdir)"
 ifeq ($(CVC4_BUILD_LIBCOMPAT),yes)
 #      install libcvc4compat
-       $(CURRENT_BUILD)/libtool --mode=install install -v \
+       $(CURRENT_BUILD)/libtool --mode=install $(install_sh) \
                $(CURRENT_BUILD)/src/compat/libcvc4compat.la \
                "$(abs_builddir)$(libdir)"
 endif
@@ -137,8 +138,8 @@ else
        done
 endif
 #      set up builds/$(CURRENT_BUILD)/bin and builds/$(CURRENT_BUILD)/lib
-       $(AM_V_at)test -e $(CURRENT_BUILD)/lib || ln -sfv "$(abs_builddir)$(libdir)" $(CURRENT_BUILD)/lib
-       $(AM_V_at)test -e $(CURRENT_BUILD)/bin || ln -sfv "$(abs_builddir)$(bindir)" $(CURRENT_BUILD)/bin
+       rm -f $(CURRENT_BUILD)/lib; ln -sf "$(abs_builddir)$(libdir)" $(CURRENT_BUILD)/lib
+       rm -f $(CURRENT_BUILD)/bin; ln -sf "$(abs_builddir)$(bindir)" $(CURRENT_BUILD)/bin
 #      set up builds/...prefix.../bin and builds/...prefix.../lib
        $(AM_V_mkdir) ".$(bindir)"
        $(AM_V_mkdir) ".$(libdir)"
@@ -148,7 +149,7 @@ endif
        $(AM_V_ltinstall) $(CURRENT_BUILD)/src/parser/libcvc4parser.la "`pwd`$(libdir)"
 ifeq ($(CVC4_BUILD_LIBCOMPAT),yes)
 #      install libcvc4compat
-       $(CURRENT_BUILD)/libtool --mode=install install -v $(CURRENT_BUILD)/src/compat/libcvc4compat.la "`pwd`$(libdir)"
+       $(CURRENT_BUILD)/libtool --mode=install $(install_sh) $(CURRENT_BUILD)/src/compat/libcvc4compat.la "`pwd`$(libdir)"
 endif
 ifeq ($(BUILDING_SHARED)$(STATIC_BINARY),10)
 #      if we're building shared libs and the binary is not static, relink
@@ -184,19 +185,19 @@ else
        done
 endif
 #      set up builds/bin and builds/lib
-       $(AM_V_at)test -e lib || ln -sfv ".$(libdir)" lib
-       $(AM_V_at)test -e bin || ln -sfv ".$(bindir)" bin
+       rm -f lib; ln -sf ".$(libdir)" lib
+       rm -f bin; ln -sf ".$(bindir)" bin
        rm -f doc; ln -sf "$(CURRENT_BUILD)/doc" doc
        rm -f examples; ln -sf "$(CURRENT_BUILD)/examples" examples
 
 # The descent into "src" with target "check" is to build check
 # prerequisites (e.g. CHECK_PROGRAMS, CHECK_LTLIBRARIES, ...).
-check test units:
+check test units: all
        (cd $(CURRENT_BUILD)/src && $(MAKE) check)
        +(cd $(CURRENT_BUILD)/test && $(MAKE) $@)
 systemtests regress: all
        +(cd $(CURRENT_BUILD)/test && $(MAKE) $@)
-units%:
+units%: all
        (cd $(CURRENT_BUILD)/src && $(MAKE) check)
        +(cd $(CURRENT_BUILD)/test && $(MAKE) units TEST_PREFIX=$(subst units:,,$@))
 regress%: all
@@ -222,6 +223,9 @@ doc-internals-builds: doc-prereq
 doc-prereq:
        +(cd $(CURRENT_BUILD) && for dir in `find . -name Makefile | xargs grep -l BUILT_SOURCES`; do (cd `dirname "$$dir"`; (cat Makefile; echo 'doc-prereq: $$(BUILT_SOURCES)') | $(MAKE) -f- doc-prereq); done)
 
-# any other target than the default doesn't do the extra stuff above
+# Any other target than the default doesn't do the extra stuff above.
+# Split out "examples" target, recent Makes don't want them combined.
+examples:
+       +(cd $(CURRENT_BUILD) && $(MAKE) $@)
 %:
        +(cd $(CURRENT_BUILD) && $(MAKE) $@)