X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=makefile;h=42e71a0e42bb0341c3cff63a8c616d6572537f4b;hp=aa69ce10aad8589557369b1c9656942e1988950b;hb=cf9987b67aa49777a4c91c2d21f96e58bf17aa82;hpb=783b9ef8e739307aed392f35970701f6b53390fb

diff --git a/makefile b/makefile
index aa69ce1..42e71a0 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 = "\"7/25/2011\""
-VERSION = "\"1.21.0\""
+RELEASE_DATE = "\"10/16/2013\""
+VERSION = "\"1.32.1\""
+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
@@ -28,10 +30,16 @@ ifeq  ($(strip $(64BIT_VERSION)),yes)
 	#if you are a mac user use the following line
 	TARGET_ARCH += -arch x86_64
 	
+	#if you using cygwin to build Windows the following line
+	#CXX = x86_64-w64-mingw32-g++
+	#CC = x86_64-w64-mingw32-g++
+	#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 += -mtune=native -march=native 
 	
-	 CXXFLAGS += -DBIT_VERSION
+	CXXFLAGS += -DBIT_VERSION 
 endif
 
 
@@ -84,11 +92,18 @@ endif
 
 OBJECTS=$(patsubst %.cpp,%.o,$(wildcard *.cpp))
 OBJECTS+=$(patsubst %.c,%.o,$(wildcard *.c))
+OBJECTS+=$(patsubst %.f,%.o,$(wildcard *.f))
 
-mothur : $(OBJECTS)
+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
@@ -103,4 +118,5 @@ install : mothur
 
 clean :
 	@rm -f $(OBJECTS)
+	@rm -f uchime