From: vijay_ganesh <vijay_ganesh@e59a4935-1847-0410-ae03-e826735625c1>
Date: Wed, 21 Oct 2009 21:07:08 +0000 (+0000)
Subject: added configclean target to makefile. Instead of make clean, do make configclean... 
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=ade6fa03297dc8ed9c5ddadbab68658a82990443;p=francis%2Fstp.git

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

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 d49ade2..8cc444e 100644
--- 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 da224d7..516f665 100755
--- 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 ef2b91f..c9f5b24 100644
--- 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 d49ade2..8cc444e 100644
--- 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 78906ac..324dae9 100644
--- 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