X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=makefile;h=c67f0ba6bd2d5a3baf675edef32fbd15679259fc;hb=HEAD;hp=100df10d1ff4cfa8330ad226a8ea5a57b6f6777a;hpb=17fe3208075e55133789b247c062e6474f7439b0;p=mothur.git

diff --git a/makefile b/makefile
index 100df10..c67f0ba 100644
--- a/makefile
+++ b/makefile
@@ -11,13 +11,13 @@
 
 USEMPI ?= no
 64BIT_VERSION ?= yes
-USEREADLINE ?= no
-CYGWIN_BUILD ?= no
+USEREADLINE ?= yes
 USECOMPRESSION ?= no
 MOTHUR_FILES="\"Enter_your_default_path_here\""
-RELEASE_DATE = "\"3/13/2012\""
-VERSION = "\"1.24.0\""
+RELEASE_DATE = "\"2/12/2014\""
+VERSION = "\"1.33.0\""
 FORTAN_COMPILER = gfortran
+FORTRAN_FLAGS = 
 
 # Optimize to level 3:
 CXXFLAGS += -O3 
@@ -36,9 +36,9 @@ ifeq  ($(strip $(64BIT_VERSION)),yes)
  	#TARGET_ARCH += -m64 -static
 
 	#if you are a linux user use the following line
-	#CXXFLAGS += -mtune=native -march=native -m64
+	#CXXFLAGS += -mtune=native -march=native 
 	
-	CXXFLAGS += -DBIT_VERSION
+	CXXFLAGS += -DBIT_VERSION 
 endif
 
 
@@ -49,10 +49,6 @@ else
 	CXXFLAGS += -DMOTHUR_FILES=${MOTHUR_FILES}
 endif
 
-ifeq  ($(strip $(CYGWIN_BUILD)),yes)
-    CXXFLAGS += -mno-cygwin
-    LDFLAGS += -mno-cygwin 
-endif
 
 # if you do not want to use the readline library, set this to no.
 # make sure you have the library installed
@@ -102,7 +98,7 @@ uchime:
 	cd uchime_src && ./mk && mv uchime .. && cd ..
 	
 fortranSource:
-	${FORTAN_COMPILER} -c -m64 *.f
+	${FORTAN_COMPILER} -c $(FORTRAN_FLAGS) *.f
 
 install : mothur
 #	cp mothur ../Release/mothur