missed files for the latter commit

[cvc5.git] / Makefile.builds.in

diff --git a/Makefile.builds.in b/Makefile.builds.in
index 6f9c7aaabef0c0c45a434f249112b509dffdbdd7..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
 
@@ -79,7 +80,7 @@ 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 examples
 _default_build_: all
@@ -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 -sf "$(abs_builddir)$(libdir)" $(CURRENT_BUILD)/lib
-       $(AM_V_at)test -e $(CURRENT_BUILD)/bin || ln -sf "$(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)"
@@ -184,19 +185,19 @@ else
        done
 endif
 #      set up builds/bin and builds/lib
-       $(AM_V_at)test -e lib || ln -sf ".$(libdir)" lib
-       $(AM_V_at)test -e bin || ln -sf ".$(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