Merge pull request #2244 from diffblue/solver-Makefile-fix

fix ordering problem in solvers/Makefile

Author: tautschnig

src/common

@@ -158,11 +158,6 @@ else
   $(error Invalid setting for BUILD_ENV: $(BUILD_ENV_))
 endif
 
-# select default solver to be minisat2 if no other is specified
-ifeq ($(BOOLEFORCE)$(CHAFF)$(GLUCOSE)$(IPASIR)$(LINGELING)$(MINISAT)$(MINISAT2)$(PICOSAT)$(CADICAL),)
-  MINISAT2 = ../../minisat-2.2.1
-endif
-
 ifneq ($(IPASIR),)
   CP_CXXFLAGS += -DHAVE_IPASIR
 endif

src/config.inc

@@ -30,6 +30,11 @@ endif
 # when linking against an IPASIR solver.
 LIBSOLVER =
 
+# select default solver to be minisat2 if no other is specified
+ifeq ($(BOOLEFORCE)$(CHAFF)$(GLUCOSE)$(IPASIR)$(LINGELING)$(MINISAT)$(MINISAT2)$(PICOSAT)$(CADICAL),)
+  MINISAT2 = ../../minisat-2.2.1
+endif
+
 ifneq ($(PICOSAT),)
   CP_CXXFLAGS += -DSATCHECK_PICOSAT
 endif

src/solvers/Makefile

@@ -1,5 +1,4 @@
 include ../config.inc
-include ../common
 
 ifneq ($(CHAFF),)
   CHAFF_SRC=sat/satcheck_zchaff.cpp sat/satcheck_zcore.cpp
@@ -195,6 +194,8 @@ SRC = $(BOOLEFORCE_SRC) \
       smt2/smt2irep.cpp \
       # Empty last line
 
+include ../common
+
 INCLUDES += -I .. \
   $(CHAFF_INCLUDE) $(BOOLEFORCE_INCLUDE) $(MINISAT_INCLUDE) $(MINISAT2_INCLUDE) \
   $(IPASIR_INCLUDE) \