X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=makefile;h=42e71a0e42bb0341c3cff63a8c616d6572537f4b;hp=c7dc1fdd1a6aeae18a6db7857a473e2be6fca966;hb=cf9987b67aa49777a4c91c2d21f96e58bf17aa82;hpb=5eca3348fe3962b8965236ca877ef6f52e8fb104 diff --git a/makefile b/makefile index c7dc1fd..42e71a0 100644 --- a/makefile +++ b/makefile @@ -15,29 +15,31 @@ USEREADLINE ?= yes CYGWIN_BUILD ?= no USECOMPRESSION ?= no MOTHUR_FILES="\"Enter_your_default_path_here\"" -RELEASE_DATE = "\"12/7/2011\"" -VERSION = "\"1.22.0\"" +RELEASE_DATE = "\"10/16/2013\"" +VERSION = "\"1.32.1\"" FORTAN_COMPILER = gfortran +FORTRAN_FLAGS = # Optimize to level 3: CXXFLAGS += -O3 ifeq ($(strip $(64BIT_VERSION)),yes) #if you are using centos uncomment the following lines - CXX = g++44 + #CXX = g++44 #if you are a mac user use the following line -# TARGET_ARCH += -arch x86_64 + 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++ + #FORTAN_COMPILER = x86_64-w64-mingw32-gfortran #TARGET_ARCH += -m64 -static #if you are a linux user use the following line - CXXFLAGS += -mtune=native -march=native -m64 + #CXXFLAGS += -mtune=native -march=native - CXXFLAGS += -DBIT_VERSION + CXXFLAGS += -DBIT_VERSION endif @@ -96,12 +98,12 @@ mothur : fortranSource $(OBJECTS) uchime $(CXX) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS) $(LIBS) strip mothur - + uchime: cd uchime_src && ./mk && mv uchime .. && cd .. fortranSource: - ${FORTAN_COMPILER} -c *.f + ${FORTAN_COMPILER} -c $(FORTRAN_FLAGS) *.f install : mothur # cp mothur ../Release/mothur