pds - modified strip barcode funcrtion in trimseqscommand

[mothur.git] / makefile

diff --git a/makefile b/makefile
index 451d613a24d3e91dd025f6f584f63f9ec5a2404a..b421ca2db2f17149198ecb0edc9839903fdccf31 100644 (file)
--- a/makefile
+++ b/makefile
@@ -2,7 +2,7 @@
 #\r
 # Makefile for mothur\r
 # Creator [Xcode -> Makefile Ver: Feb 14 2007 09:18:41]\r
-# Created: [Thu Mar  4 08:31:03 2010]\r
+# Created: April 16, 2010\r
 #\r
 ###################################################\r
 \r
@@ -10,9 +10,8 @@
 # Macros\r
 #\r
 \r
-CC = mpic++\r
+CC = g++\r
 CC_OPTIONS = -O3\r
-LNK_OPTIONS = \r
 \r
 # if you do not want to use the readline library set to no, default yes.\r
 # make sure you have the library installed\r
@@ -27,7 +26,8 @@ ifeq  ($(strip $(USEREADLINE)),yes)
       -L../readline-6.0\r
 endif\r
 \r
-USEMPI ?= no\r
+USEMPI ?= no
+\r
 \r
 ifeq  ($(strip $(USEMPI)),yes)\r
     CC_OPTIONS += -DUSE_MPI\r
@@ -219,8 +219,11 @@ mothur : \
                ./classifyseqscommand.o\\r
                ./parsesffcommand.o\\r
                ./classify.o\\r
-               ./phylotree.o\\r
-               ./bayesian.o\\r
+               ./phylotree.o\
+               ./phylodiversity.o\
+               ./phylodiversitycommand.o\\r
+               ./bayesian.o\
+               ./phylosummary.o\\r
                ./alignmentdb.o\\r
                ./knn.o\\r
                ./distancedb.o\\r
@@ -239,7 +242,8 @@ mothur : \
                ./qstat.o\\r
                ./shen.o\\r
                ./logsd.o\\r
-               ./geom.o\r
+               ./geom.o\
+               ./setlogfilecommand.o\r
        $(CC) $(LNK_OPTIONS) \\r
                ./sharedutilities.o\\r
                ./treegroupscommand.o\\r
@@ -416,8 +420,11 @@ mothur : \
                ./classifyseqscommand.o\\r
                ./parsesffcommand.o\\r
                ./classify.o\\r
-               ./phylotree.o\\r
-               ./bayesian.o\\r
+               ./phylotree.o\
+               ./phylodiversity.o\
+               ./phylodiversitycommand.o\\r
+               ./bayesian.o\
+               ./phylosummary.o\\r
                ./alignmentdb.o\\r
                ./knn.o\\r
                ./distancedb.o\\r
@@ -436,8 +443,9 @@ mothur : \
                ./qstat.o\\r
                ./shen.o\\r
                ./logsd.o\\r
-               ./geom.o\\r
-               -o ../Release/mothur\r
+               ./geom.o\
+               ./setlogfilecommand.o\\r
+               -o mothur\r
 \r
 clean : \r
                rm \\r
@@ -616,8 +624,11 @@ clean :
                ./classifyseqscommand.o\\r
                ./parsesffcommand.o\\r
                ./classify.o\\r
-               ./phylotree.o\\r
-               ./bayesian.o\\r
+               ./phylotree.o\
+               ./phylodiversity.o\
+               ./phylodiversitycommand.o\\r
+               ./bayesian.o\
+               ./phylosummary.o\\r
                ./alignmentdb.o\\r
                ./knn.o\\r
                ./distancedb.o\\r
@@ -636,7 +647,8 @@ clean :
                ./qstat.o\\r
                ./shen.o\\r
                ./logsd.o\\r
-               ./geom.o\\r
+               ./geom.o\
+               ./setlogfilecommand.o\\r
                mothur\r
 \r
 install : mothur\r
@@ -1620,6 +1632,23 @@ install : mothur
 # Item # 196 -- chimerabellerophoncommand --\r
 ./chimerabellerophoncommand.o : chimerabellerophoncommand.cpp\r
        $(CC) $(CC_OPTIONS) chimerabellerophoncommand.cpp -c $(INCLUDE) -o ./chimerabellerophoncommand.o\r
+
+# Item # 197 -- phylosummary --\r
+./phylosummary.o : phylosummary.cpp\r
+       $(CC) $(CC_OPTIONS) phylosummary.cpp -c $(INCLUDE) -o ./phylosummary.o\r
+
+# Item # 198 -- setlogfilecommand --\r
+./setlogfilecommand.o : setlogfilecommand.cpp\r
+       $(CC) $(CC_OPTIONS) setlogfilecommand.cpp -c $(INCLUDE) -o ./setlogfilecommand.o\r
+\r
+# Item # 199 -- phylodiversity --\r
+./phylodiversity.o : phylodiversity.cpp\r
+       $(CC) $(CC_OPTIONS) phylodiversity.cpp -c $(INCLUDE) -o ./phylodiversity.o\r
+\r
+# Item # 200 -- phylodiversitycommand --\r
+./phylodiversitycommand.o : phylodiversitycommand.cpp\r
+       $(CC) $(CC_OPTIONS) phylodiversitycommand.cpp -c $(INCLUDE) -o ./phylodiversitycommand.o\r
+\r
 \r
 \r
 ##### END RUN ####\r