1.22.0

[mothur.git] / makefile

diff --git a/makefile b/makefile
index 3f6431210735a622f8c0e416a088581d331ed714..35857e0cba8b408610f7d230d150b34bfb6915a0 100644 (file)
--- a/makefile
+++ b/makefile
@@ -14,12 +14,12 @@ 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 = "\"10/18/2011\""
+VERSION = "\"1.22.0\""
 
 # Optimize to level 3:
-CXXFLAGS += -03 -g
+CXXFLAGS += -O3
 
 ifeq  ($(strip $(64BIT_VERSION)),yes)
        #if you are using centos uncomment the following lines
@@ -90,11 +90,14 @@ endif
 OBJECTS=$(patsubst %.cpp,%.o,$(wildcard *.cpp))
 OBJECTS+=$(patsubst %.c,%.o,$(wildcard *.c))
 
-mothur : $(OBJECTS)
+mothur : $(OBJECTS) uchime
        $(CXX) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS) $(LIBS)
        
        strip mothur
 
+uchime:
+       cd uchime_src && ./mk && mv uchime .. && cd ..
+
 install : mothur
 #      cp mothur ../Release/mothur
        
@@ -108,4 +111,5 @@ install : mothur
 
 clean :
        @rm -f $(OBJECTS)
+       @rm -f uchime