X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=makefile;h=773b52f3db800aafb94a1da4dbabbe1967134759;hb=6446d2e9713a95db5f772135b7aa3387f7ebf7bb;hp=3f0893c5ad82d811fb4c5cf05f86f0326b4561c8;hpb=202846c98b9eff0eca7b20a570bfffa8ee4a5f4e;p=mothur.git

diff --git a/makefile b/makefile
index 3f0893c..773b52f 100644
--- a/makefile
+++ b/makefile
@@ -13,7 +13,13 @@
 
 CXXFLAGS += -O3
 
-MOTHUR_FILES = "\"Enter_your_default_path_here\""
+MOTHUR_FILES = "\"../Release\""
+
+RELEASE_DATE = "\"9/17/2010\""
+VERSION = "\"1.13.0\""
+
+CXXFLAGS += -DRELEASE_DATE=${RELEASE_DATE} -DVERSION=${VERSION}
+
 ifeq  ($(strip $(MOTHUR_FILES)),"\"Enter_your_default_path_here\"")
 else
 	CXXFLAGS += -DMOTHUR_FILES=${MOTHUR_FILES}
@@ -28,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
-	#CC = g++44
+	#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
 
@@ -55,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
 #
@@ -66,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