From: trevor_hansen <trevor_hansen@e59a4935-1847-0410-ae03-e826735625c1>
Date: Mon, 17 Oct 2011 11:45:45 +0000 (+0000)
Subject: Cleanup a bit. Include suggestion from Oliver Crameri.
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=f75bd42699e574ee6bf0562d643452b230b4d10f;p=francis%2Fstp.git

Cleanup a bit. Include suggestion from Oliver Crameri.

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

diff --git a/scripts/Makefile.common b/scripts/Makefile.common
index 5973ce2..df26d6e 100644
--- a/scripts/Makefile.common
+++ b/scripts/Makefile.common
@@ -10,16 +10,11 @@
 
 -include $(TOP)/scripts/config.info
 
-#OPTIMIZE     = -g -pg            # Debugging and gprof-style profiling
-#OPTIMIZE      = -g                # Debugging
-#OPTIMIZE      = -O3 -fPIC         # Maximum optimization
-#OPTIMIZE      = -O3 -march=native -fomit-frame-pointer # Maximum optimization
-#OPTIMIZE      = -O3 -march=native -DNDEBUG -DLESSBYTES_PERNODE
-OPTIMIZE      = -O3  -g            # Maximum optimization
+OPTIMIZE      = -O3 -DNDEBUG -march=native -fomit-frame-pointer # Optimization
+#OPTIMIZE      =  -O3 -g            # Debug
 
 #CFLAGS_M32   = -m32
-
-CFLAGS_BASE   = $(OPTIMIZE)
+CFLAGS_BASE   += $(OPTIMIZE)
 
 ifeq ($(WITHCBITP),yes)
 	CFLAGS_BASE += -DWITHCBITP
@@ -39,8 +34,8 @@ ifdef STATIC
 endif
 
 
-LDFLAGS = $(LDFLAGS_BASE)
-CFLAGS = $(CFLAGS_BASE) $(CFLAGS_M32)
+LDFLAGS += $(LDFLAGS_BASE)
+CFLAGS += $(CFLAGS_BASE) $(CFLAGS_M32)
 
 
 #Required by minisat2.2