X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=makefile;h=7cc71f0e9a4064a2163707f3f7bc08da36af2b5e;hb=095a4c7aed0cf5ef79eaf28f0d79d3aa51c2811e;hp=5eb8daaab6d8163b1b48852ccef7e21a406b28dc;hpb=bf83aa09a52403a2faf1a1f82489d1e0c8c32283;p=mothur.git

diff --git a/makefile b/makefile
index 5eb8daa..7cc71f0 100644
--- a/makefile
+++ b/makefile
@@ -9,12 +9,18 @@
 # Macros
 #
 
-# Optimize to level 3:
+USEMPI ?= no
+64BIT_VERSION ?= yes
+USEREADLINE ?= yes
+CYGWIN_BUILD ?= no
+USECOMPRESSION ?= no
+MOTHUR_FILES = "\"../release\""
+RELEASE_DATE = "\"2/7/2011\""
+VERSION = "\"1.16.0\""
 
+# Optimize to level 3:
 CXXFLAGS += -O3
 
-64BIT_VERSION ?= yes
-
 ifeq  ($(strip $(64BIT_VERSION)),yes)
 	#if you are using centos uncomment the following lines
 	#CXX = g++44
@@ -28,10 +34,6 @@ ifeq  ($(strip $(64BIT_VERSION)),yes)
 	 CXXFLAGS += -DBIT_VERSION
 endif
 
-MOTHUR_FILES = "\"../release\""
-
-RELEASE_DATE = "\"12/10/2010\""
-VERSION = "\"1.15.0\""
 
 CXXFLAGS += -DRELEASE_DATE=${RELEASE_DATE} -DVERSION=${VERSION}
 
@@ -40,7 +42,6 @@ else
 	CXXFLAGS += -DMOTHUR_FILES=${MOTHUR_FILES}
 endif
 
-CYGWIN_BUILD ?= no
 ifeq  ($(strip $(CYGWIN_BUILD)),yes)
     CXXFLAGS += -mno-cygwin
     LDFLAGS += -mno-cygwin 
@@ -49,7 +50,6 @@ endif
 # if you do not want to use the readline library, set this to no.
 # make sure you have the library installed
 
-USEREADLINE ?= yes
 
 ifeq  ($(strip $(USEREADLINE)),yes)
     CXXFLAGS += -DUSE_READLINE
@@ -58,7 +58,6 @@ ifeq  ($(strip $(USEREADLINE)),yes)
       -lncurses
 endif
 
-USEMPI ?= yes
 
 ifeq  ($(strip $(USEMPI)),yes)
     CXX = mpic++
@@ -68,7 +67,6 @@ endif
 # if you want to enable reading and writing of compressed files, set to yes.
 # The default is no.  this may only work on unix-like systems, not for windows.
 
-USECOMPRESSION ?= no
 
 ifeq  ($(strip $(USECOMPRESSION)),yes)
   CXXFLAGS += -DUSE_COMPRESSION