X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=makefile;h=de21717ce03df122f7df9ddc014cc49900768250;hb=bd27c2b0612942815b7417c79f7ee41f669a2a34;hp=35857e0cba8b408610f7d230d150b34bfb6915a0;hpb=4f2c7f477a1ef2d60a1c0c84ab1ba8243af67f87;p=mothur.git

diff --git a/makefile b/makefile
index 35857e0..de21717 100644
--- a/makefile
+++ b/makefile
@@ -15,11 +15,13 @@ USEREADLINE ?= yes
 CYGWIN_BUILD ?= no
 USECOMPRESSION ?= no
 MOTHUR_FILES="\"Enter_your_default_path_here\""
-RELEASE_DATE = "\"10/18/2011\""
-VERSION = "\"1.22.0\""
+RELEASE_DATE = "\"5/24/2013\""
+VERSION = "\"1.31.0\""
+FORTAN_COMPILER = gfortran
+FORTRAN_FLAGS = 
 
 # Optimize to level 3:
-CXXFLAGS += -O3
+CXXFLAGS += -O3 
 
 ifeq  ($(strip $(64BIT_VERSION)),yes)
 	#if you are using centos uncomment the following lines
@@ -31,12 +33,14 @@ ifeq  ($(strip $(64BIT_VERSION)),yes)
 	#if you using cygwin to build Windows the following line
 	#CXX = x86_64-w64-mingw32-g++
 	#CC = x86_64-w64-mingw32-g++
- 	#TARGET_ARCH += -m64
+	#FORTAN_COMPILER = x86_64-w64-mingw32-gfortran
+ 	#TARGET_ARCH += -m64 -static
 
 	#if you are a linux user use the following line
 	#CXXFLAGS += -mtune=native -march=native -m64
 	
-	 CXXFLAGS += -DBIT_VERSION
+	CXXFLAGS += -DBIT_VERSION 
+    FORTRAN_FLAGS = -m64
 endif
 
 
@@ -89,14 +93,18 @@ endif
 
 OBJECTS=$(patsubst %.cpp,%.o,$(wildcard *.cpp))
 OBJECTS+=$(patsubst %.c,%.o,$(wildcard *.c))
+OBJECTS+=$(patsubst %.f,%.o,$(wildcard *.f))
 
-mothur : $(OBJECTS) uchime
+mothur : fortranSource $(OBJECTS) uchime
 	$(CXX) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS) $(LIBS)
 	
 	strip mothur
-
+ 
 uchime:
 	cd uchime_src && ./mk && mv uchime .. && cd ..
+	
+fortranSource:
+	${FORTAN_COMPILER} -c $(FORTRAN_FLAGS) *.f
 
 install : mothur
 #	cp mothur ../Release/mothur