Support a personal build configuration and make rules.

diff --git a/Makefile b/Makefile
index 4683711973883eb7f39779df037a8888a38141f8..923d6afe6d381264b02c1bb88d0db991807cf371 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@ all install examples install-examples .DEFAULT:
                cd $(builddir); \
                echo $(MAKE) $@; \
                $(MAKE) $@ || exit 1; \
+               $(MAKE) show-config; \
        else \
                echo; \
                echo 'Run configure first, or type "make" in a configured build directory.'; \

diff --git a/Makefile.am b/Makefile.am
index 9e9f73a3ba71bf4777a4a3d085bd92c635441c8f..41586cbe7eca0a036b5f9b68a763de02524d7649 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,15 @@ LCOV_EXCLUDES = \
        "/usr/include/*" \
        "$(abs_top_builddir)/test/*"
 
+.PHONY: show-config
+show-config:
+       @echo
+       @echo '==============================================================================='
+       @echo 'This CVC4 build was configured with:'
+       @echo '  configure $(cvc4_config_cmdline)'
+       @echo '==============================================================================='
+       @echo
+
 .PHONY: lcov lcov-all lcov18
 if COVERAGE_ENABLED
 

diff --git a/config/cvc4.m4 b/config/cvc4.m4
index e75476e8e96a7a33243dce1e3df9e6ec13e23853..1b241feb41fbcf8a487822a7d157cc07e68feec1 100644 (file)
--- a/config/cvc4.m4
+++ b/config/cvc4.m4
@@ -13,9 +13,8 @@ dnl _AS_ME_PREPARE
 AC_DEFUN([CVC4_REWRITE_ARGS_FOR_BUILD_PROFILE],
 [m4_divert_push([PARSE_ARGS])dnl
 
-unset ac_cvc4_rewritten_args
-for ac_option
-do
+handle_option() {
+  ac_option="$[]1"
   case $ac_option in
     -*|*=*) ;;
     production|production-*|debug|debug-*|default|default-*|competition|competition-*)
@@ -55,6 +54,24 @@ do
       ac_option="--with-build=$ac_option_build"
   esac
   eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }'\'\$ac_option\'\"
+}
+
+unset ac_cvc4_rewritten_args
+for ac_option
+do
+  if test "$ac_option" = personal; then
+    if test -e personal.conf; then
+      handle_option --enable-personal-make-rules
+      while read arg; do
+        handle_option "$arg"
+      done < personal.conf
+    else
+      AC_MSG_ERROR([personal build profile selected, but cannot find personal.conf])
+    fi
+  else
+echo "calling for $ac_option"
+    handle_option "$ac_option"
+  fi
 done
 eval set x $ac_cvc4_rewritten_args
 shift

diff --git a/configure.ac b/configure.ac
index dce990c69701156450ec88cdfef84ddf1ecea850..56f462b343ef082fc7880d4a11d0d0184ccbb42f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,7 @@ CVC4_BINDINGS_LIBRARY_VERSION=_CVC4_BINDINGS_LIBRARY_VERSION
 # included in the output... autoconf overrides us on the orderings of
 # some things.)
 config_cmdline=("$@")
+cvc4_config_cmdline="${config_cmdline[[@]]}"
 
 # remember if the user set these explicitly (or whether autoconf does)
 user_specified_enable_or_disable_static=${enable_static+yes}
@@ -106,7 +107,7 @@ fi
 AC_MSG_CHECKING([for requested build profile])
 AC_ARG_WITH([build],
   [AS_HELP_STRING([--with-build=profile],
-     [for profile in {production,debug,default,competition}])])
+     [for profile in {production,debug,default,competition,personal}])])
 
 if test -z "${with_build+set}" -o "$with_build" = default; then
   with_build=default
@@ -812,6 +813,21 @@ if test "$target_vendor" = apple; then
   CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-D_GLIBCXX_VISIBILITY_DEFAULT=\"__attribute__((__visibility__(\\\"default\\\")))\""
 fi
 
+# Tell top-level Makefile to include $(top_srcdir)/personal.mk
+AC_ARG_ENABLE([personal-make-rules],
+  [AS_HELP_STRING([--enable-personal-make-rules],
+     [include top-level personal.mk (if it exists)])])
+if test "$enable_personal_make_rules" = yes; then
+  # This allows us to include a personal.mk makefile from every
+  # generated makefile.  Named zz_* in order to make sure this
+  # comes last, so it gets other definitions (in particular top_srcdir).
+  zz_cvc4_use_personal_make_rules='yes
+
+include $(top_srcdir)/personal.mk
+$(top_srcdir)/personal.mk:; @touch "$@"'
+  AC_SUBST([zz_cvc4_use_personal_make_rules])
+fi
+
 # Doxygen configuration
 AC_ARG_ENABLE([internals-documentation],
   [AS_HELP_STRING([--enable-internals-documentation],
@@ -1196,6 +1212,9 @@ AC_SUBST(FLAG_VISIBILITY_HIDDEN)
 AC_SUBST(cvc4_LDFLAGS)
 AC_SUBST(pcvc4_LDFLAGS)
 
+# remember the command line used for configure
+AC_SUBST(cvc4_config_cmdline)
+
 # mk_include
 #
 # When automake scans Makefiles, it complains about non-standard make
@@ -1211,6 +1230,11 @@ AC_SUBST(pcvc4_LDFLAGS)
 # makefiles with GNU extensions; this hides them from automake.
 mk_include=include
 AC_SUBST(mk_include)
+# Similar trickery for "if"
+mk_if=if
+AC_SUBST(mk_if)
+mk_empty=
+AC_SUBST(mk_empty)
 
 # CVC4_FALSE
 #

diff --git a/test/regress/regress0/Makefile.am b/test/regress/regress0/Makefile.am
index 962c4180fe87ea6e559437f3311b01a61d5295b4..8ae9b3ae2114c28fd67746259ad949b529dd69bb 100644 (file)
--- a/test/regress/regress0/Makefile.am
+++ b/test/regress/regress0/Makefile.am
@@ -1,7 +1,11 @@
 SUBDIRS = . arith precedence uf uflra uflia bv arrays aufbv auflia datatypes quantifiers rewriterules lemmas push-pop preprocess tptp unconstrained decision fmf strings
 DIST_SUBDIRS = . arith precedence uf uflra uflia bv arrays aufbv auflia datatypes quantifiers rewriterules lemmas push-pop preprocess tptp unconstrained decision fmf strings
 
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/arith/Makefile.am b/test/regress/regress0/arith/Makefile.am
index 246d362239882a725825d46055678ff604e1da34..6897ee3c4fbf3a18d4501d86bfbb4349569aea65 100644 (file)
--- a/test/regress/regress0/arith/Makefile.am
+++ b/test/regress/regress0/arith/Makefile.am
@@ -1,6 +1,10 @@
 SUBDIRS = . integers
 
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/arith/integers/Makefile.am b/test/regress/regress0/arith/integers/Makefile.am
index eca78b58f3451a08a16805da3f549de4dff71be9..3511c6b30c793125c5ba9f62f3b8b9696d836a67 100644 (file)
--- a/test/regress/regress0/arith/integers/Makefile.am
+++ b/test/regress/regress0/arith/integers/Makefile.am
@@ -1,6 +1,10 @@
 SUBDIRS = .
 
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/arrays/Makefile.am b/test/regress/regress0/arrays/Makefile.am
index e8642bc4fdad8051e96add80fc3022356205fd1b..33f05ab40e7b40a4d3abd420b6adcfee1d443c60 100644 (file)
--- a/test/regress/regress0/arrays/Makefile.am
+++ b/test/regress/regress0/arrays/Makefile.am
@@ -1,4 +1,8 @@
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/aufbv/Makefile.am b/test/regress/regress0/aufbv/Makefile.am
index 862e4880bb9e670cc5a8e46ccaa762b95b7ccc03..e151a4846ba5eb4df0c124fae6a33108ef3bafd2 100644 (file)
--- a/test/regress/regress0/aufbv/Makefile.am
+++ b/test/regress/regress0/aufbv/Makefile.am
@@ -1,4 +1,8 @@
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/auflia/Makefile.am b/test/regress/regress0/auflia/Makefile.am
index 85bda7bfeed952cffb1ea69a5d5d75e77dcf91ce..ca1fc25d3dddb6c3e856459a644e43889410b9d7 100644 (file)
--- a/test/regress/regress0/auflia/Makefile.am
+++ b/test/regress/regress0/auflia/Makefile.am
@@ -1,4 +1,8 @@
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/bv/Makefile.am b/test/regress/regress0/bv/Makefile.am
index dbd9547a9cca8554d5477bb09fd0ec897610167e..f0bfb2842e4faf37ee034b7f871c06ad308accb6 100644 (file)
--- a/test/regress/regress0/bv/Makefile.am
+++ b/test/regress/regress0/bv/Makefile.am
@@ -1,6 +1,10 @@
 SUBDIRS = . core
 
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/bv/core/Makefile.am b/test/regress/regress0/bv/core/Makefile.am
index 53cdadc4f3460911601e0b5e6e1a913571120aa3..888e9d8dc58979652cc8165fb844b1db2fc7570c 100644 (file)
--- a/test/regress/regress0/bv/core/Makefile.am
+++ b/test/regress/regress0/bv/core/Makefile.am
@@ -1,4 +1,8 @@
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/datatypes/Makefile.am b/test/regress/regress0/datatypes/Makefile.am
index 478d0d5f33910dfa851313ff4ad84ec9690ebb23..31999b203aa1c895c94bbb64fd7289872f421e77 100644 (file)
--- a/test/regress/regress0/datatypes/Makefile.am
+++ b/test/regress/regress0/datatypes/Makefile.am
@@ -1,6 +1,10 @@
 SUBDIRS = .
 
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/decision/Makefile.am b/test/regress/regress0/decision/Makefile.am
index 969d201241ab2911152377a3f59de86a1dab0d92..0f8ef8e8edfdc5beee37dc32161f32edfae48dc6 100644 (file)
--- a/test/regress/regress0/decision/Makefile.am
+++ b/test/regress/regress0/decision/Makefile.am
@@ -1,4 +1,8 @@
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/fmf/Makefile.am b/test/regress/regress0/fmf/Makefile.am
index 97b48c7165a9bb670270c858332e1ce02fe73288..601d6579951ab56e08c0ebc5cf685fcb72573cf0 100644 (file)
--- a/test/regress/regress0/fmf/Makefile.am
+++ b/test/regress/regress0/fmf/Makefile.am
@@ -1,4 +1,8 @@
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/lemmas/Makefile.am b/test/regress/regress0/lemmas/Makefile.am
index 126b206abcd718af88d0fe99d0b3674504ee7410..260b3600d06e1730f2f37e569f14de03836939c9 100644 (file)
--- a/test/regress/regress0/lemmas/Makefile.am
+++ b/test/regress/regress0/lemmas/Makefile.am
@@ -1,6 +1,10 @@
 SUBDIRS = . 
 
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/precedence/Makefile.am b/test/regress/regress0/precedence/Makefile.am
index 4b8b4a05d748d2da9547c0e968451927e4530efa..141510ea24ba2ac940be8744d7177775c66d6f14 100644 (file)
--- a/test/regress/regress0/precedence/Makefile.am
+++ b/test/regress/regress0/precedence/Makefile.am
@@ -1,4 +1,8 @@
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/preprocess/Makefile.am b/test/regress/regress0/preprocess/Makefile.am
index fe02b230eaf4c71ef383d539afd51b5560d619be..73d13e78d8534a7d8a1b720295c99ec833cdbcc9 100644 (file)
--- a/test/regress/regress0/preprocess/Makefile.am
+++ b/test/regress/regress0/preprocess/Makefile.am
@@ -1,6 +1,10 @@
 SUBDIRS = . 
 
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/push-pop/Makefile.am b/test/regress/regress0/push-pop/Makefile.am
index 16b0bbf858a75d7b326704a6cb4efff397f5d6c2..0a10942383f03edc90f8f5817ae0ded47d73a9ae 100644 (file)
--- a/test/regress/regress0/push-pop/Makefile.am
+++ b/test/regress/regress0/push-pop/Makefile.am
@@ -1,6 +1,10 @@
 SUBDIRS = boolean arith . 
 
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/push-pop/arith/Makefile.am b/test/regress/regress0/push-pop/arith/Makefile.am
index 7171e6e210444a758ff2dc8c502d5b72acb4e1e2..6fd183ec388a80ae3eb1b931b2e62113a8f9de95 100644 (file)
--- a/test/regress/regress0/push-pop/arith/Makefile.am
+++ b/test/regress/regress0/push-pop/arith/Makefile.am
@@ -1,6 +1,10 @@
 SUBDIRS = . 
 
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/push-pop/boolean/Makefile.am b/test/regress/regress0/push-pop/boolean/Makefile.am
index 5b12f59fa8045accab0a8710b5827c72a770cd8c..0757ebfc2194003d1a56527e903ccfa59087fade 100644 (file)
--- a/test/regress/regress0/push-pop/boolean/Makefile.am
+++ b/test/regress/regress0/push-pop/boolean/Makefile.am
@@ -1,6 +1,10 @@
 SUBDIRS = . 
 
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/quantifiers/Makefile.am b/test/regress/regress0/quantifiers/Makefile.am
index 31a27cb57ac35005b6d6cc25980b9aa4422fab4a..0b74d83b7b7fa73c3f6c1f942a6687596564bba5 100644 (file)
--- a/test/regress/regress0/quantifiers/Makefile.am
+++ b/test/regress/regress0/quantifiers/Makefile.am
@@ -1,4 +1,8 @@
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/rewriterules/Makefile.am b/test/regress/regress0/rewriterules/Makefile.am
index 1750887336fd7a90142121a484a0c12cafe30a4b..d2e748fbf652599f5cb01a5190fadc5ec8272a98 100644 (file)
--- a/test/regress/regress0/rewriterules/Makefile.am
+++ b/test/regress/regress0/rewriterules/Makefile.am
@@ -1,7 +1,11 @@
 CVC4_REGRESSION_ARGS ?= --efficient-e-matching
 export CVC4_REGRESSION_ARGS
 
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/strings/Makefile.am b/test/regress/regress0/strings/Makefile.am
index 37da1091e83fdc4f7e02f6eba5930b5ce65755f7..269ec49ed6503e2797c1235809f1c6ea92c61d3c 100644 (file)
--- a/test/regress/regress0/strings/Makefile.am
+++ b/test/regress/regress0/strings/Makefile.am
@@ -1,6 +1,8 @@
-SUBDIRS = .
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
 
-BINARY = cvc4
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/tptp/Makefile.am b/test/regress/regress0/tptp/Makefile.am
index 130a9dc7cf4d5e052b76c094677303e20486834f..e227e0bbafce6f762b5b7c534f8fb33ef453816d 100644 (file)
--- a/test/regress/regress0/tptp/Makefile.am
+++ b/test/regress/regress0/tptp/Makefile.am
@@ -1,4 +1,8 @@
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/uf/Makefile.am b/test/regress/regress0/uf/Makefile.am
index 66ce8e3e6b65df8401602778dcd15a3dc3861bc7..bf9a36df1186d2413e45cd13b59ebeaed8dbb1dd 100644 (file)
--- a/test/regress/regress0/uf/Makefile.am
+++ b/test/regress/regress0/uf/Makefile.am
@@ -1,4 +1,8 @@
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/uflia/Makefile.am b/test/regress/regress0/uflia/Makefile.am
index 34fd797b66d49fb7db89717696bc27a93562aef3..2ef7be86206a97a2a34da882d0e746ed7aa4cd8a 100644 (file)
--- a/test/regress/regress0/uflia/Makefile.am
+++ b/test/regress/regress0/uflia/Makefile.am
@@ -1,4 +1,8 @@
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/uflra/Makefile.am b/test/regress/regress0/uflra/Makefile.am
index ceade2038388c8a1fd29ee45adba419b50f15af0..63d362bf9e5c4aba85d1ef2d1f2469fcad87ecbf 100644 (file)
--- a/test/regress/regress0/uflra/Makefile.am
+++ b/test/regress/regress0/uflra/Makefile.am
@@ -1,4 +1,8 @@
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress0/unconstrained/Makefile.am b/test/regress/regress0/unconstrained/Makefile.am
index 9a6ca29baf3152e6423db390e92429f8145f61bd..c9a38d7b17257a0e2f273b44a9f6ae6db151df28 100644 (file)
--- a/test/regress/regress0/unconstrained/Makefile.am
+++ b/test/regress/regress0/unconstrained/Makefile.am
@@ -1,4 +1,8 @@
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress1/Makefile.am b/test/regress/regress1/Makefile.am
index a636a4f0fee7d5b3f527e33950d2abbc28c2e34b..674f5c75e9c08d26184fa10f2ffccdf78de3ec59 100644 (file)
--- a/test/regress/regress1/Makefile.am
+++ b/test/regress/regress1/Makefile.am
@@ -1,6 +1,10 @@
 SUBDIRS = . arith
 
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress1/arith/Makefile.am b/test/regress/regress1/arith/Makefile.am
index bfbafdd3a06ebe77a44ddfa471b0a5601968b953..9d8534b30ced427bb23e997eabef635353a093a8 100644 (file)
--- a/test/regress/regress1/arith/Makefile.am
+++ b/test/regress/regress1/arith/Makefile.am
@@ -1,4 +1,8 @@
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress2/Makefile.am b/test/regress/regress2/Makefile.am
index 028eb4cc8bf40bcdf928bc1a03b01d1ac027f7fd..e4e5d8d29d23c180b64f9cf3d708b7188a23b90e 100644 (file)
--- a/test/regress/regress2/Makefile.am
+++ b/test/regress/regress2/Makefile.am
@@ -1,6 +1,10 @@
 SUBDIRS = .
 
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 

diff --git a/test/regress/regress3/Makefile.am b/test/regress/regress3/Makefile.am
index ed3e66b20df9abcd7fcd1e0c429b5f1e5dd2fadb..213157491351881cf3a807555fd24dd509cff8cd 100644 (file)
--- a/test/regress/regress3/Makefile.am
+++ b/test/regress/regress3/Makefile.am
@@ -1,6 +1,10 @@
 SUBDIRS = .
 
-BINARY = cvc4
+# don't override a BINARY imported from a personal.mk
+@mk_if@eq ($(BINARY),)
+@mk_empty@BINARY = cvc4
+end@mk_if@
+
 LOG_COMPILER = @srcdir@/../run_regression
 AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)