Removing template.mk completely, and replacing it with proper Makefile-s in minisat...

git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk/stp@427 e59a4935-1847-0410-ae03-e826735625c1

diff --git a/src/sat/core/Makefile b/src/sat/core/Makefile
index eb2bee27a4cbfb7f015b9062df4a3d395e918f85..c36465fbe84708df232a51ee90756ee2c5b77667 100644 (file)
--- a/src/sat/core/Makefile
+++ b/src/sat/core/Makefile
@@ -1,12 +1,23 @@
 include   ../../../scripts/Makefile.common
+
 MTL       = ../mtl
-CHDRS     = $(wildcard *.h) $(wildcard $(MTL)/*.h)
+SOURCES   = Solver.C
+OBJECTS   = $(SOURCES:.C=.o)
+LIB       = libminisat.a
+CFLAGS    += -I$(MTL) -DEXT_HASH_MAP -ffloat-store $(CFLAGS_M32) -c
 EXEC      = minisat
-CFLAGS    += -I$(MTL) -Wall -DEXT_HASH_MAP -ffloat-store $(CFLAGS_M32)
 LFLAGS    = -lz
 
-include ../mtl/template.mk
-all: libminisat.a
-       ranlib libminisat.a
-       cp *.or ../
-       cp libminisat.a ../
+all: $(LIB) #$(EXEC)
+lib: $(LIB)
+
+$(LIB): $(OBJECTS)
+       rm -f $@
+       ar cq $@ $(OBJECTS)
+       cp $(LIB) ../
+
+clean:
+       rm $(OBJECTS) $(LIB) ../$(LIB)
+
+.C.o:
+       $(CC) $(CFLAGS) $< -o $@

diff --git a/src/sat/mtl/template.mk b/src/sat/mtl/template.mk
deleted file mode 100644 (file)
index baf87a3..0000000
--- a/src/sat/mtl/template.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-##
-##  Template makefile for Standard, Profile, Debug, Release, and Release-static versions
-##
-##    eg: "make rs" for a statically linked release version.
-##        "make d"  for a debug version (no optimizations).
-##        "make"    for the standard version (optimized, but with debug information and assertions active)
-
-CSRCS     ?= $(wildcard *.C)
-CHDRS     ?= $(wildcard *.h)
-COBJS     ?= $(addsuffix .o, $(basename $(CSRCS))) 
-
-PCOBJS     = $(addsuffix p,  $(COBJS))
-DCOBJS     = $(addsuffix d,  $(COBJS))
-RCOBJS     = $(addsuffix r,  $(COBJS))
-
-EXEC      ?= $(notdir $(shell pwd))
-LIB       ?= $(EXEC)
-
-CXX       ?= g++
-CFLAGS    ?= -Wall
-LFLAGS    ?= -Wall
-
-COPTIMIZE ?= -O3
-
-.PHONY : s p d r rs lib libd clean 
-
-s:     $(EXEC)
-p:     $(EXEC)_profile
-d:     $(EXEC)_debug
-r:     $(EXEC)_release
-rs:    $(EXEC)_static
-lib:   lib$(LIB).a
-libd:  lib$(LIB)d.a
-libp:  lib$(LIB)p.a
-
-## Compile options
-%.o:                   CFLAGS +=$(COPTIMIZE) -ggdb -D DEBUG
-%.op:                  CFLAGS +=$(COPTIMIZE) -pg -ggdb -D NDEBUG -DEXT_HASH_MAP
-%.od:                  CFLAGS +=-O0 -ggdb -D DEBUG # -D INVARIANTS
-%.or:                  CFLAGS +=$(COPTIMIZE) -D NDEBUG
-
-## Link options
-$(EXEC):               LFLAGS := -ggdb $(LFLAGS)
-$(EXEC)_profile:       LFLAGS := -ggdb -pg $(LFLAGS)
-$(EXEC)_debug:         LFLAGS := -ggdb $(LFLAGS)
-$(EXEC)_release:       LFLAGS := $(LFLAGS)
-$(EXEC)_static:                LFLAGS := --static $(LFLAGS)
-
-## Dependencies
-$(EXEC):               $(COBJS)
-$(EXEC)_profile:       $(PCOBJS)
-$(EXEC)_debug:         $(DCOBJS)
-$(EXEC)_release:       $(RCOBJS)
-$(EXEC)_static:                $(RCOBJS)
-
-lib$(LIB).a:   $(filter-out Main.or, $(RCOBJS))
-lib$(LIB)d.a:  $(filter-out Main.od, $(DCOBJS))
-lib$(LIB)p.a:  $(filter-out Main.op, $(PCOBJS))
-
-
-## Build rule
-%.o %.op %.od %.or:    %.C
-       @echo Compiling: "$@ ( $< )"
-       $(CXX) $(CFLAGS) -c -o $@ $<
-
-## Linking rules (standard/profile/debug/release)
-$(EXEC) $(EXEC)_profile $(EXEC)_debug $(EXEC)_release $(EXEC)_static:
-       @echo Linking: "$@ ( $^ )"
-       @$(CXX) $^ $(LFLAGS) -o $@
-
-## Library rule
-lib$(LIB).a lib$(LIB)d.a lib$(LIB)p.a:
-       @echo Library: "$@ ( $^ )"
-       @rm -f $@
-       @ar cq $@ $^    
-
-## Clean rule
-clean:
-       @rm -f *~ $(EXEC) $(EXEC)_profile $(EXEC)_debug $(EXEC)_release $(EXEC)_static \
-       $(COBJS) $(PCOBJS) $(DCOBJS) $(RCOBJS) *.core depend.mk depend.mak lib$(LIB).a \
-       lib$(LIB)d.a lib$(LIB)p.a
-
-## Make dependencies
-depend.mk: $(CSRCS) $(CHDRS)
-       @echo Making dependencies ...
-       @$(CXX) $(CFLAGS) -MM $(CSRCS) > depend.mk
-       @cp depend.mk /tmp/depend.mk.tmp
-       @sed "s/o:/op:/" /tmp/depend.mk.tmp >> depend.mk
-       @sed "s/o:/od:/" /tmp/depend.mk.tmp >> depend.mk
-       @sed "s/o:/or:/" /tmp/depend.mk.tmp >> depend.mk
-       @rm /tmp/depend.mk.tmp
-
--include depend.mk

diff --git a/src/sat/simp/Makefile b/src/sat/simp/Makefile
index d703f13afed9bea11f3ecd2e3f60f5c1a979d7b7..9e2a508fdfd5c77d1a6a3417f2b40d3c4108e550 100644 (file)
--- a/src/sat/simp/Makefile
+++ b/src/sat/simp/Makefile
@@ -1,16 +1,23 @@
 include   ../../../scripts/Makefile.common
+
 MTL       = ../mtl
-CORE      = ../core
-CHDRS     = $(wildcard *.h) $(wildcard $(MTL)/*.h)
+SOURCES   = SimpSolver.C ../core/Solver.C
+OBJECTS   = $(SOURCES:.C=.o)
+LIB       = libminisat.a
+CFLAGS    += -I$(MTL) -DEXT_HASH_MAP -ffloat-store $(CFLAGS_M32) -c
 EXEC      = minisat
-CFLAGS    = -I$(MTL) -I$(CORE) -DEXT_HASH_MAP -ffloat-store $(CFLAGS_M32)
 LFLAGS    = -lz
 
-CSRCS     = $(wildcard *.C)
-COBJS     = $(addsuffix .o, $(basename $(CSRCS))) $(CORE)/Solver.o
+all: $(LIB) #$(EXEC)
+lib: $(LIB)
+
+$(LIB): $(OBJECTS)
+       rm -f $@
+       ar cq $@ $(OBJECTS)
+       cp $(LIB) ../
+
+clean:
+       rm $(OBJECTS) $(LIB) ../$(LIB)
 
-include ../mtl/template.mk
-all: libminisat.a
-       ranlib libminisat.a
-       cp *.or ../
-       cp libminisat.a ../
+.C.o:
+       $(CC) $(CFLAGS) $< -o $@