added configclean target to makefile. Instead of make clean, do make configclean...

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

diff --git a/Makefile b/Makefile
index d49ade215f9834762080ccb847dba7db25d418b2..8cc444e1f8921d832be29b6d1828afb7501f5346 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ install: all
 
 .PHONY: clean
 clean:
-       rm -rf *~ scripts/*~ scripts/config.info
+       rm -rf *~ scripts/*~
        rm -rf *.a
        rm -rf lib/*.a
        rm -rf test/*~
@@ -72,6 +72,10 @@ clean:
        $(MAKE) clean -C $(SRC)/main
        $(MAKE) clean -C tests/c-api-tests
 
+.PHONY: configclean
+configclean:
+       rm -rf scripts/config.info
+
 .PHONY: regressall
 regressall:
        $(MAKE) regresscapi && $(MAKE) regresscvc && $(MAKE) regresssmt && $(MAKE) regressstp && $(MAKE) regressbigarray

diff --git a/clean-install.sh b/clean-install.sh
index da224d7f02d1c595b3e529bc789dcd1f50bbab70..516f66595f48473436400bea6caf25725144d723 100755 (executable)
--- a/clean-install.sh
+++ b/clean-install.sh
@@ -17,6 +17,7 @@ while [ $# -gt 0 ]; do
 done
 
 make clean
+make configclean
 ./scripts/configure --with-prefix=$PREFIX
 make install
 

diff --git a/scripts/Makefile.common b/scripts/Makefile.common
index ef2b91fef432a0ca3c8f4eb0fa2fae573ba0e721..c9f5b243803cdf4bccae80af7700f8bee30b4f73 100644 (file)
--- a/scripts/Makefile.common
+++ b/scripts/Makefile.common
@@ -41,7 +41,8 @@ ifeq ($(shell uname -s), DarwinX)
   CFLAGS = -isysroot $(UNIVERSAL_SDK) $(UNIVERSAL_ARCH) $(CFLAGS_BASE)
 else
   LDFLAGS = $(LDFLAGS_BASE)
-  CFLAGS = $(CFLAGS_BASE) -m32
+  #CFLAGS = $(CFLAGS_BASE) -m32
+  CFLAGS = $(CFLAGS_BASE)      
 endif
 
 #CXXFLAGS = $(CFLAGS) -Wall -Wextra -DEXT_HASH_MAP -Wno-deprecated

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index d49ade215f9834762080ccb847dba7db25d418b2..8cc444e1f8921d832be29b6d1828afb7501f5346 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -51,7 +51,7 @@ install: all
 
 .PHONY: clean
 clean:
-       rm -rf *~ scripts/*~ scripts/config.info
+       rm -rf *~ scripts/*~
        rm -rf *.a
        rm -rf lib/*.a
        rm -rf test/*~
@@ -72,6 +72,10 @@ clean:
        $(MAKE) clean -C $(SRC)/main
        $(MAKE) clean -C tests/c-api-tests
 
+.PHONY: configclean
+configclean:
+       rm -rf scripts/config.info
+
 .PHONY: regressall
 regressall:
        $(MAKE) regresscapi && $(MAKE) regresscvc && $(MAKE) regresssmt && $(MAKE) regressstp && $(MAKE) regressbigarray

diff --git a/src/sat/core/Makefile b/src/sat/core/Makefile
index 78906ac8566a1bf90f6d5bc592daf6fadb15bc04..324dae95eea46ac71eb027393eb763c79d1bf50b 100644 (file)
--- a/src/sat/core/Makefile
+++ b/src/sat/core/Makefile
@@ -1,7 +1,8 @@
 MTL       = ../mtl
 CHDRS     = $(wildcard *.h) $(wildcard $(MTL)/*.h)
 EXEC      = minisat
-CFLAGS    = -I$(MTL) -Wall -DEXT_HASH_MAP -ffloat-store -m32
+#CFLAGS    = -I$(MTL) -Wall -DEXT_HASH_MAP -ffloat-store -m32
+CFLAGS    = -I$(MTL) -Wall -DEXT_HASH_MAP -ffloat-store
 LFLAGS    = -lz