diff options
33 files changed, 199 insertions, 34 deletions
@@ -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 9e9f73a3b..41586cbe7 100644 --- 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 e75476e8e..1b241feb4 100644 --- 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 dce990c69..56f462b34 100644 --- 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 962c4180f..8ae9b3ae2 100644 --- 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 246d36223..6897ee3c4 100644 --- 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 eca78b58f..3511c6b30 100644 --- 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 e8642bc4f..33f05ab40 100644 --- 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 862e4880b..e151a4846 100644 --- 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 85bda7bfe..ca1fc25d3 100644 --- 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 dbd9547a9..f0bfb2842 100644 --- 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 53cdadc4f..888e9d8dc 100644 --- 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 478d0d5f3..31999b203 100644 --- 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 969d20124..0f8ef8e8e 100644 --- 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 97b48c716..601d65799 100644 --- 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 126b206ab..260b3600d 100644 --- 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 4b8b4a05d..141510ea2 100644 --- 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 fe02b230e..73d13e78d 100644 --- 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 16b0bbf85..0a1094238 100644 --- 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 7171e6e21..6fd183ec3 100644 --- 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 5b12f59fa..0757ebfc2 100644 --- 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 31a27cb57..0b74d83b7 100644 --- 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 175088733..d2e748fbf 100644 --- 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 37da1091e..269ec49ed 100644 --- 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 130a9dc7c..e227e0bba 100644 --- 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 66ce8e3e6..bf9a36df1 100644 --- 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 34fd797b6..2ef7be862 100644 --- 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 ceade2038..63d362bf9 100644 --- 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 9a6ca29ba..c9a38d7b1 100644 --- 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 a636a4f0f..674f5c75e 100644 --- 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 bfbafdd3a..9d8534b30 100644 --- 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 028eb4cc8..e4e5d8d29 100644 --- 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 ed3e66b20..213157491 100644 --- 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) |