Skip to content

Commit e4f620e

Browse files
committed
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.
1 parent 930ca47 commit e4f620e

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

src/solvers/Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ ifneq ($(MINISAT),)
1111
MINISAT_INCLUDE=-I $(MINISAT)
1212
MINISAT_LIB=$(MINISAT)/Solver$(OBJEXT) $(MINISAT)/Proof$(OBJEXT) $(MINISAT)/File$(OBJEXT)
1313
CP_CXXFLAGS += -DHAVE_MINISAT
14-
CLEANFILES += $(MINISAT_LIB) $(patsubst %$(OBJEXT), %.d, $(MINISAT_LIB))
14+
CLEANFILES += $(MINISAT_LIB) $(patsubst %$(OBJEXT), %$(DEPEXT), $(MINISAT_LIB))
1515
endif
1616

1717
ifneq ($(MINISAT2),)
1818
MINISAT2_SRC=sat/satcheck_minisat2.cpp
1919
MINISAT2_INCLUDE=-I $(MINISAT2)
2020
MINISAT2_LIB=$(MINISAT2)/minisat/simp/SimpSolver$(OBJEXT) $(MINISAT2)/minisat/core/Solver$(OBJEXT)
2121
CP_CXXFLAGS += -DHAVE_MINISAT2 -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
22-
CLEANFILES += $(MINISAT2_LIB) $(patsubst %$(OBJEXT), %.d, $(MINISAT2_LIB))
22+
CLEANFILES += $(MINISAT2_LIB) $(patsubst %$(OBJEXT), %$(DEPEXT), $(MINISAT2_LIB))
2323
endif
2424

2525
ifneq ($(IPASIR),)
@@ -35,7 +35,7 @@ ifneq ($(GLUCOSE),)
3535
GLUCOSE_INCLUDE=-I $(GLUCOSE)
3636
GLUCOSE_LIB=$(GLUCOSE)/simp/SimpSolver$(OBJEXT) $(GLUCOSE)/core/Solver$(OBJEXT)
3737
CP_CXXFLAGS += -DHAVE_GLUCOSE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
38-
CLEANFILES += $(GLUCOSE_LIB) $(patsubst %$(OBJEXT), %.d, $(GLUCOSE_LIB))
38+
CLEANFILES += $(GLUCOSE_LIB) $(patsubst %$(OBJEXT), %$(DEPEXT), $(GLUCOSE_LIB))
3939
endif
4040

4141
ifneq ($(SQUOLEM2),)
@@ -215,6 +215,11 @@ SOLVER_LIB = $(CHAFF_LIB) $(BOOLEFORCE_LIB) $(MINISAT_LIB) \
215215
$(MINISAT2_LIB) $(SQUOLEM2_LIB) $(CUDD_LIB) \
216216
$(PICOSAT_LIB) $(LINGELING_LIB) $(GLUCOSE_LIB) $(CADICAL_LIB)
217217

218+
SOLVER_OBJS = $(filter %$(OBJEXT), $(SOLVER_LIB))
219+
ifneq ($(SOLVER_OBJS),)
220+
-include $(SOLVER_OBJS:$(OBJEXT)=$(DEPEXT))
221+
endif
222+
218223
###############################################################################
219224

220225
solvers$(LIBEXT): $(OBJ) $(SOLVER_LIB)

0 commit comments

Comments
 (0)