Add an OPTIMIZE Makefile flag to make it easier to enable optimization

or debugging without otherwise breaking the build. Plus some other
cosmetic changes to Makefile comments.

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

diff --git a/Makefile.common b/Makefile.common
index 10cf366cdfb39c4b35b65153e82b1b4e36730ef1..3d5c21e3c210766437c54b55f396a279692b6ba8 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,3 +1,4 @@
+# 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
@@ -6,10 +7,11 @@
 #OPTIONS1 = -DNATIVE_C_ARITH
 #OPTIONS2 = -DSMTLIB
 
-#CFLAGS_BASE = -g -ggdb -pg $(OPTIONS1) $(OPTIONS2)
-#CFLAGS_BASE = -ggdb $(OPTIONS1) $(OPTIONS2)
+#OPTIMIZE = -g -pg # Debugging and gprof-style profiling
+#OPTIMIZE = -g     # Debugging
+OPTIMIZE = -O3     # Maximum optimization
 
-CFLAGS_BASE = -O3 $(OPTIONS1) $(OPTIONS2)
+CFLAGS_BASE = $(OPTIMIZE) $(OPTIONS1) $(OPTIONS2)
 # You can compile using make STATIC=true to compile a statically linked executable
 # Note that you should execute liblinks.sh first.
 ifdef STATIC
@@ -42,6 +44,7 @@ else
 endif
 
 CXXFLAGS = $(CFLAGS) -Wall -DEXT_HASH_MAP
+#CXXFLAGS = $(CFLAGS) -Wall -DTR1_UNORDERED_MAP
 #CXXFLAGS = $(CFLAGS) -Wall 
 #LDFLAGS= -lstdc++
 #LDFLAGS= -lstdc++ -pg

diff --git a/Makefile.in b/Makefile.in
index e9ab2a37677727cc3afcc496d96e9eeb7ea7025f..169adbc03b91a11b50839d302e1dfb22c83dc082 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
  # STP (Simple Theorem Prover) top level makefile
  #
- # To make in debug mode, type 'make "CFLAGS=-ggdb"
- # To make in optimized mode, type 'make "CFLAGS=-O2" 
+ # To make in debug mode, type 'make "OPTIMIZE=-g"
+ # To make in optimized mode, type 'make "OPTIMIZE=-O3" 
 
 
 include Makefile.common config.info
@@ -51,8 +51,8 @@ clean:
        rm -rf bin/*~
        rm -rf bin/stp
        rm -rf *.log
-       #rm -rf Makefile
-       #rm -rf config.info
+       @#rm -rf Makefile
+       @#rm -rf config.info
        rm -f TAGS
        $(MAKE) clean -C AST
        $(MAKE) clean -C sat/core