X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=makefile;h=0f7d0981991a9b12db6513bff253a47ea7e25009;hb=c651c46022761aef61644f78462365d8f767ff0b;hp=1b8e0462007179c8dfd09966153ed4ebb54a21a3;hpb=8173238f9f94af9baab8471de58bed7c8830948d;p=mothur.git

diff --git a/makefile b/makefile
index 1b8e046..0f7d098 100644
--- a/makefile
+++ b/makefile
@@ -9,12 +9,18 @@
 # Macros
 #
 
-# Optimize to level 3:
+USEMPI ?= no
+64BIT_VERSION ?= yes
+USEREADLINE ?= yes
+CYGWIN_BUILD ?= no
+USECOMPRESSION ?= no
+MOTHUR_FILES="\"Enter_your_default_path_here\""
+RELEASE_DATE = "\"7/25/2011\""
+VERSION = "\"1.21.0\""
 
+# Optimize to level 3:
 CXXFLAGS += -O3
 
-64BIT_VERSION ?= yes
-
 ifeq  ($(strip $(64BIT_VERSION)),yes)
 	#if you are using centos uncomment the following lines
 	#CXX = g++44
@@ -22,16 +28,17 @@ ifeq  ($(strip $(64BIT_VERSION)),yes)
 	#if you are a mac user use the following line
 	TARGET_ARCH += -arch x86_64
 	
+	#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
+
 	#if you are a linux user use the following line
 	#CXXFLAGS += -mtune=native -march=native -m64
 	
 	 CXXFLAGS += -DBIT_VERSION
 endif
 
-MOTHUR_FILES = "\"../release\""
-
-RELEASE_DATE = "\"11/02/2010\""
-VERSION = "\"1.14.0\""
 
 CXXFLAGS += -DRELEASE_DATE=${RELEASE_DATE} -DVERSION=${VERSION}
 
@@ -40,7 +47,6 @@ else
 	CXXFLAGS += -DMOTHUR_FILES=${MOTHUR_FILES}
 endif
 
-CYGWIN_BUILD ?= no
 ifeq  ($(strip $(CYGWIN_BUILD)),yes)
     CXXFLAGS += -mno-cygwin
     LDFLAGS += -mno-cygwin 
@@ -49,7 +55,6 @@ endif
 # if you do not want to use the readline library, set this to no.
 # make sure you have the library installed
 
-USEREADLINE ?= yes
 
 ifeq  ($(strip $(USEREADLINE)),yes)
     CXXFLAGS += -DUSE_READLINE
@@ -58,7 +63,6 @@ ifeq  ($(strip $(USEREADLINE)),yes)
       -lncurses
 endif
 
-USEMPI ?= no
 
 ifeq  ($(strip $(USEMPI)),yes)
     CXX = mpic++
@@ -68,7 +72,6 @@ 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, not for windows.
 
-USECOMPRESSION ?= no
 
 ifeq  ($(strip $(USECOMPRESSION)),yes)
   CXXFLAGS += -DUSE_COMPRESSION
@@ -89,9 +92,11 @@ OBJECTS+=$(patsubst %.c,%.o,$(wildcard *.c))
 
 mothur : $(OBJECTS)
 	$(CXX) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS) $(LIBS)
+	
+	strip mothur
 
 install : mothur
-	cp mothur ../Release/mothur
+#	cp mothur ../Release/mothur
 	
 %.o : %.c %.h
 	$(COMPILE.c) $(OUTPUT_OPTION) $<