X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=makefile;h=3ce1686327126b12c45afb51599b2e5a066e19aa;hb=70491a12902e89b85cfa6b44a7b7fbe066ee2ac1;hp=c389a9468706d4ea214c7f4e3dfffc3c220da365;hpb=43ed0accfbc2852849e104ff7eccdd2c42acd4ec;p=mothur.git diff --git a/makefile b/makefile index c389a94..3ce1686 100644 --- a/makefile +++ b/makefile @@ -9,15 +9,16 @@ # Macros # -USEMPI ?= yes +USEMPI ?= no 64BIT_VERSION ?= yes -USEREADLINE ?= no +USEREADLINE ?= yes CYGWIN_BUILD ?= no USECOMPRESSION ?= no MOTHUR_FILES="\"Enter_your_default_path_here\"" -RELEASE_DATE = "\"3/12/2012\"" -VERSION = "\"1.24.4\"" -FORTAN_COMPILER = /usr/local/gfortran/bin/gfortran +RELEASE_DATE = "\"2/12/2013\"" +VERSION = "\"1.29.2\"" +FORTAN_COMPILER = 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