From: vijay_ganesh <vijay_ganesh@e59a4935-1847-0410-ae03-e826735625c1>
Date: Wed, 21 Oct 2009 22:19:08 +0000 (+0000)
Subject: Changed makefiles in src/sat and scripts/Makefile.common such that m32 flag needs... 
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=c9822b4df6158c964675ebc43a732d015ee5fb0f;p=francis%2Fstp.git

Changed makefiles in src/sat and scripts/Makefile.common such that m32 flag needs to be specified only in Makefile.common

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

diff --git a/scripts/Makefile.common b/scripts/Makefile.common
index c9f5b24..da491e2 100644
--- a/scripts/Makefile.common
+++ b/scripts/Makefile.common
@@ -1,15 +1,19 @@
 # This is a -*- makefile -*-, Emacs
 #
-#Please refer LICENSE FILE in the home directory for licensing
-#information always use full screen mode to view/edit this file in
-#emacs
+#/********************************************************************
+# * AUTHORS: Vijay Ganesh
+# *
+# * BEGIN DATE: November, 2005
+# *
+# * LICENSE: Please view LICENSE file in the home dir of this Program
+# ********************************************************************/
 
 #OPTIMIZE = -g -pg           # Debugging and gprof-style profiling
 OPTIMIZE = -g                # Debugging
 OPTIMIZE = -O3 -DNDEBUG      # Maximum optimization
 #OPTIMIZE = -O3 -DNDEBUG -DLESSBYTES_PERNODE
 CFLAGS_BASE = $(OPTIMIZE)
-
+CFLAGS_M32  = -m32
 
 # You can compile using make STATIC=true to compile a statically
 # linked executable Note that you should execute liblinks.sh first.
@@ -41,8 +45,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)	
+  CFLAGS = $(CFLAGS_BASE)		
+  CFLAGS = $(CFLAGS_BASE) $(CFLAGS_M32)
 endif
 
 #CXXFLAGS = $(CFLAGS) -Wall -Wextra -DEXT_HASH_MAP -Wno-deprecated
diff --git a/src/sat/core/Makefile b/src/sat/core/Makefile
index 324dae9..a150a4f 100644
--- a/src/sat/core/Makefile
+++ b/src/sat/core/Makefile
@@ -1,11 +1,10 @@
+include   ../../../scripts/Makefile.common
 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
+CFLAGS    = -I$(MTL) -Wall -DEXT_HASH_MAP -ffloat-store $(CFLAGS_M32)
 LFLAGS    = -lz
 
-
 include ../mtl/template.mk
 all:
 	ranlib libminisat.a
diff --git a/src/sat/simp/Makefile b/src/sat/simp/Makefile
index 51859fc..3d5a7bb 100644
--- a/src/sat/simp/Makefile
+++ b/src/sat/simp/Makefile
@@ -1,8 +1,9 @@
+include   ../../../scripts/Makefile.common
 MTL       = ../mtl
 CORE      = ../core
 CHDRS     = $(wildcard *.h) $(wildcard $(MTL)/*.h)
 EXEC      = minisat
-CFLAGS    = -I$(MTL) -I$(CORE) -DEXT_HASH_MAP -Wall -ffloat-store
+CFLAGS    = -I$(MTL) -I$(CORE) -DEXT_HASH_MAP -Wall -ffloat-store $(CFLAGS_M32)
 LFLAGS    = -lz
 
 CSRCS     = $(wildcard *.C)
diff --git a/src/sat/unsound/Makefile b/src/sat/unsound/Makefile
index 77afd67..f57ec3f 100644
--- a/src/sat/unsound/Makefile
+++ b/src/sat/unsound/Makefile
@@ -1,8 +1,9 @@
+include   ../../../scripts/Makefile.common
 MTL       = ../mtl
 CORE      = ../core
 CHDRS     = $(wildcard *.h) $(wildcard $(MTL)/*.h)
 EXEC      = minisat
-CFLAGS    = -I$(MTL) -I$(CORE) -Wall -ffloat-store
+CFLAGS    = -I$(MTL) -I$(CORE) -Wall -ffloat-store $(CFLAGS_M32)
 LFLAGS    = -lz
 
 CSRCS     = $(wildcard *.C)