Skip to content

smt2_solver.{o,d} should be removed by "make clean" #2015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 6, 2018
Merged

smt2_solver.{o,d} should be removed by "make clean" #2015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
839d32a
smt2_solver.{o,d} should be removed by "make clean"
tautschnig Apr 6, 2018
392144d
Makefiles: Place .d suffix used for dependencies in DEPEXT variable
tautschnig Apr 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ ifeq ($(filter-out Unix MinGW OSX OSX_Universal FreeBSD,$(BUILD_ENV_)),)
# Linux-ish
LIBEXT = .a
OBJEXT = .o
DEPEXT = .d
ifeq ($(BUILD_ENV_),MinGW)
EXEEXT = .exe
else
Expand Down Expand Up @@ -96,6 +97,7 @@ else ifeq ($(BUILD_ENV_),Cygwin)
# use these for Cygwin:
LIBEXT = .a
OBJEXT = .o
DEPEXT = .d
EXEEXT = .exe
CFLAGS ?= -Wall -O2
CXXFLAGS ?= -Wall -O2
Expand Down Expand Up @@ -128,6 +130,7 @@ else ifeq ($(BUILD_ENV_),MSVC)
# use these for Visual Studio:
LIBEXT = .lib
OBJEXT = .obj
DEPEXT = .dep
EXEEXT = .exe
CFLAGS ?= /W3 /O2 /GF
CXXFLAGS ?= /W3 /D_CRT_SECURE_NO_WARNINGS /O2 /GF
Expand Down Expand Up @@ -208,7 +211,7 @@ CP_CXXFLAGS += $(CXXFLAGS) $(INCLUDES)
OBJ += $(patsubst %.cpp, %$(OBJEXT), $(filter %.cpp, $(SRC)))
OBJ += $(patsubst %.cc, %$(OBJEXT), $(filter %.cc, $(SRC)))

.SUFFIXES: .cc .d .cpp
.SUFFIXES: .cc $(DEPEXT) .cpp

%.o:%.cpp
$(CXX) -c $(CP_CXXFLAGS) -o $@ $<
Expand All @@ -231,9 +234,9 @@ OBJ += $(patsubst %.cc, %$(OBJEXT), $(filter %.cc, $(SRC)))

clean:
$(RM) $(patsubst %.cpp, %$(OBJEXT), $(filter %.cpp, $(SRC))) \
$(patsubst %.cpp, %.d, $(filter %.cpp, $(SRC))) \
$(patsubst %.cpp, %$(DEPEXT), $(filter %.cpp, $(SRC))) \
$(patsubst %.cc, %$(OBJEXT), $(filter %.cc, $(SRC))) \
$(patsubst %.cc, %.d, $(filter %.cc, $(SRC))) \
$(patsubst %.cc, %$(DEPEXT), $(filter %.cc, $(SRC))) \
$(CLEANFILES)

.PHONY: first_target clean all
Expand All @@ -250,8 +253,8 @@ sources: Makefile
# include .depend
# endif

D_FILES1 = $(SRC:.c=.d)
D_FILES = $(D_FILES1:.cpp=.d)
D_FILES1 = $(SRC:.c=$(DEPEXT))
D_FILES = $(D_FILES1:.cpp=$(DEPEXT))

-include $(D_FILES)

7 changes: 2 additions & 5 deletions src/solvers/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ INCLUDES += -I .. \
$(SMVSAT_INCLUDE) $(SQUOLEM2_INC) $(CUDD_INCLUDE) $(GLUCOSE_INCLUDE) \
$(PRECOSAT_INCLUDE) $(PICOSAT_INCLUDE) $(LINGELING_INCLUDE)

CLEANFILES = solvers$(LIBEXT) smt2_solver$(EXEEXT)
CLEANFILES = solvers$(LIBEXT) \
smt2_solver$(EXEEXT) smt2/smt2_solver$(OBJEXT) smt2/smt2_solver$(DEPEXT)

all: solvers$(LIBEXT) smt2_solver$(EXEEXT)

Expand All @@ -229,10 +230,6 @@ ifneq ($(CUDD),)
endif
endif

# extra dependencies

-include $(SRC:.cpp=.d)

SOLVER_LIB = $(CHAFF_LIB) $(BOOLEFORCE_LIB) $(MINISAT_LIB) \
$(MINISAT2_LIB) $(SMVSAT_LIB) $(SQUOLEM2_LIB) $(CUDD_LIB) \
$(PRECOSAT_LIB) $(PICOSAT_LIB) $(LINGELING_LIB) $(GLUCOSE_LIB)
Expand Down