added sequence name to error string in fastq.info. Changed np_shannon to npshannon.

[mothur.git] / makefile

diff --git a/makefile b/makefile
index 3f6431210735a622f8c0e416a088581d331ed714..476070eb2fbb654d054238c45ee335b2ce8fe0eb 100644 (file)
--- a/makefile
+++ b/makefile
@@ -14,12 +14,13 @@ USEMPI ?= no
 USEREADLINE ?= yes
 CYGWIN_BUILD ?= no
 USECOMPRESSION ?= no
-MOTHUR_FILES="\"/Users/Sarahswork/desktop/release\""
-RELEASE_DATE = "\"7/25/2011\""
-VERSION = "\"1.21.0\""
+MOTHUR_FILES="\"Enter_your_default_path_here\""
+RELEASE_DATE = "\"1/9/2012\""
+VERSION = "\"1.23.0\""
+FORTAN_COMPILER = gfortran
 
 # Optimize to level 3:
-CXXFLAGS += -03 -g
+CXXFLAGS += -O3 
 
 ifeq  ($(strip $(64BIT_VERSION)),yes)
        #if you are using centos uncomment the following lines
@@ -31,7 +32,8 @@ 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
@@ -89,12 +91,19 @@ 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 *.f
+
 install : mothur
 #      cp mothur ../Release/mothur
        
@@ -108,4 +117,5 @@ install : mothur
 
 clean :
        @rm -f $(OBJECTS)
+       @rm -f uchime