From e4f620e202cadcec848378c3a782af0e12c2ba60 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Tue, 10 Apr 2018 12:32:59 +0100 Subject: [PATCH] Track dependencies for built SAT solver objects The difference can be observed by running, e.g., touch minisat-2.2.1/minisat/mtl/Sort.h which now does trigger the required rebuilds. --- src/solvers/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/solvers/Makefile b/src/solvers/Makefile index a199c954030..93b92c8b7a3 100644 --- a/src/solvers/Makefile +++ b/src/solvers/Makefile @@ -11,7 +11,7 @@ ifneq ($(MINISAT),) MINISAT_INCLUDE=-I $(MINISAT) MINISAT_LIB=$(MINISAT)/Solver$(OBJEXT) $(MINISAT)/Proof$(OBJEXT) $(MINISAT)/File$(OBJEXT) CP_CXXFLAGS += -DHAVE_MINISAT - CLEANFILES += $(MINISAT_LIB) $(patsubst %$(OBJEXT), %.d, $(MINISAT_LIB)) + CLEANFILES += $(MINISAT_LIB) $(patsubst %$(OBJEXT), %$(DEPEXT), $(MINISAT_LIB)) endif ifneq ($(MINISAT2),) @@ -19,7 +19,7 @@ ifneq ($(MINISAT2),) MINISAT2_INCLUDE=-I $(MINISAT2) MINISAT2_LIB=$(MINISAT2)/minisat/simp/SimpSolver$(OBJEXT) $(MINISAT2)/minisat/core/Solver$(OBJEXT) CP_CXXFLAGS += -DHAVE_MINISAT2 -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS - CLEANFILES += $(MINISAT2_LIB) $(patsubst %$(OBJEXT), %.d, $(MINISAT2_LIB)) + CLEANFILES += $(MINISAT2_LIB) $(patsubst %$(OBJEXT), %$(DEPEXT), $(MINISAT2_LIB)) endif ifneq ($(IPASIR),) @@ -35,7 +35,7 @@ ifneq ($(GLUCOSE),) GLUCOSE_INCLUDE=-I $(GLUCOSE) GLUCOSE_LIB=$(GLUCOSE)/simp/SimpSolver$(OBJEXT) $(GLUCOSE)/core/Solver$(OBJEXT) CP_CXXFLAGS += -DHAVE_GLUCOSE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS - CLEANFILES += $(GLUCOSE_LIB) $(patsubst %$(OBJEXT), %.d, $(GLUCOSE_LIB)) + CLEANFILES += $(GLUCOSE_LIB) $(patsubst %$(OBJEXT), %$(DEPEXT), $(GLUCOSE_LIB)) endif ifneq ($(SQUOLEM2),) @@ -215,6 +215,11 @@ SOLVER_LIB = $(CHAFF_LIB) $(BOOLEFORCE_LIB) $(MINISAT_LIB) \ $(MINISAT2_LIB) $(SQUOLEM2_LIB) $(CUDD_LIB) \ $(PICOSAT_LIB) $(LINGELING_LIB) $(GLUCOSE_LIB) $(CADICAL_LIB) +SOLVER_OBJS = $(filter %$(OBJEXT), $(SOLVER_LIB)) +ifneq ($(SOLVER_OBJS),) +-include $(SOLVER_OBJS:$(OBJEXT)=$(DEPEXT)) +endif + ############################################################################### solvers$(LIBEXT): $(OBJ) $(SOLVER_LIB)