X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=makefile;h=bc5a569e31cd2e12526bb20244adb75e58333ece;hb=e8e13c129ba8184ec5932a090773f353f3ae3406;hp=100df10d1ff4cfa8330ad226a8ea5a57b6f6777a;hpb=17fe3208075e55133789b247c062e6474f7439b0;p=mothur.git diff --git a/makefile b/makefile index 100df10..bc5a569 100644 --- a/makefile +++ b/makefile @@ -11,13 +11,14 @@ USEMPI ?= no 64BIT_VERSION ?= yes -USEREADLINE ?= no +USEREADLINE ?= yes CYGWIN_BUILD ?= no USECOMPRESSION ?= no MOTHUR_FILES="\"Enter_your_default_path_here\"" -RELEASE_DATE = "\"3/13/2012\"" -VERSION = "\"1.24.0\"" -FORTAN_COMPILER = gfortran +RELEASE_DATE = "\"7/9/2012\"" +VERSION = "\"1.26.0\"" +FORTAN_COMPILER = /usr/local/gfortran/bin/gfortran +FORTRAN_FLAGS = # Optimize to level 3: CXXFLAGS += -O3 @@ -38,7 +39,8 @@ ifeq ($(strip $(64BIT_VERSION)),yes) #if you are a linux user use the following line #CXXFLAGS += -mtune=native -march=native -m64 - CXXFLAGS += -DBIT_VERSION + CXXFLAGS += -DBIT_VERSION + FORTRAN_FLAGS = -m64 endif @@ -102,7 +104,7 @@ uchime: cd uchime_src && ./mk && mv uchime .. && cd .. fortranSource: - ${FORTAN_COMPILER} -c -m64 *.f + ${FORTAN_COMPILER} -c $(FORTRAN_FLAGS) *.f install : mothur # cp mothur ../Release/mothur