added distance option to summary.shared

[mothur.git] / makefile

diff --git a/makefile b/makefile
index 6f194bb349eacfcdf23424a950db3cf387f17d1e..773b52f3db800aafb94a1da4dbabbe1967134759 100644 (file)
--- a/makefile
+++ b/makefile
@@ -15,7 +15,7 @@ CXXFLAGS += -O3
 
 MOTHUR_FILES = "\"../Release\""
 
-RELEASE_DATE = "\"9/9/2010\""
+RELEASE_DATE = "\"9/17/2010\""
 VERSION = "\"1.13.0\""
 
 CXXFLAGS += -DRELEASE_DATE=${RELEASE_DATE} -DVERSION=${VERSION}
@@ -34,11 +34,15 @@ endif
 64BIT_VERSION ?= yes
 
 ifeq  ($(strip $(64BIT_VERSION)),yes)
-    TARGET_ARCH += -arch x86_64
         CXXFLAGS += -DBIT_VERSION
        
        #if you are using centos uncomment the following lines
        #CXX = g++44
+       
+       #if you are a mac user use the following line
+       TARGET_ARCH += -arch x86_64
+       
+       #if you are a linux user use the following line
        #CXXFLAGS += -mtune=native -march=native -m64
 endif
 
@@ -61,6 +65,15 @@ ifeq  ($(strip $(USEMPI)),yes)
     CXXFLAGS += -DUSE_MPI
 endif
 
+# if you want to enable reading and writing of compressed files, set to yes.
+# The default is no.  this may only work on unix-like systems.
+
+USECOMPRESSION ?= no
+
+ifeq  ($(strip $(USECOMPRESSION)),yes)
+  CXXFLAGS += -DUSE_COMPRESSION
+endif
+
 #
 # INCLUDE directories for mothur
 #
@@ -72,13 +85,16 @@ endif
 #
 
 OBJECTS=$(patsubst %.cpp,%.o,$(wildcard *.cpp))
+OBJECTS+=$(patsubst %.c,%.o,$(wildcard *.c))
 
 mothur : $(OBJECTS)
        $(CXX) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS)
 
 install : mothur
        cp mothur ../Release/mothur
-
+       
+%.o : %.c %.h
+       $(COMPILE.c) $(OUTPUT_OPTION) $<
 %.o : %.cpp %.h
        $(COMPILE.cpp) $(OUTPUT_OPTION) $<
 %.o : %.cpp %.hpp