git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3012 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp 2009-08-07 14:42:29 +00:00
parent a90d442b26
commit 14b3f4f92f
4 changed files with 19 additions and 21 deletions

View File

@ -8,14 +8,14 @@ SHELL = /bin/sh
include Makefile.package include Makefile.package
CC = c++ CC = c++
CCFLAGS = $(PKGINC) -O -I../STUBS -DFFT_FFTW CCFLAGS = -O -DFFT_FFTW -I../STUBS $(PKGINC)
DEPFLAGS = -M DEPFLAGS = -M
LINK = c++ LINK = c++
LINKFORT = LINKFORT =
LINKFLAGS = $(PKGPATH) $(LINKFORT) -O LINKFLAGS = -O $(PKGPATH) $(LINKFORT)
USRLIB = $(PKGLIB) -lfftw ../STUBS/mpi.o USRLIB = -lfftw ../STUBS/mpi.o $(PKGLIB)
FORTLIB = FORTLIB =
SYSLIB = $(FORTLIB) SYSLIB = $(FORTLIB)
SIZE = size SIZE = size
# Link rule # Link rule

View File

@ -10,14 +10,14 @@ include Makefile.package
FFTW = /sw FFTW = /sw
CC = mpic++ CC = mpic++
CCFLAGS = $(PKGINC) -O -MMD -MG -DFFT_FFTW -I${FFTW}/include -DOMPI_SKIP_MPICXX CCFLAGS = -O -MMD -MG -DFFT_FFTW \
-I${FFTW}/include -DOMPI_SKIP_MPICXX $(PKGINC)
LINK = mpic++ LINK = mpic++
LINKFORT = LINKFORT =
LINKFLAGS = $(PKGPATH) $(LINKFORT) -O -L${FFTW}/lib LINKFLAGS = -O -L${FFTW}/lib $(PKGPATH) $(LINKFORT)
USRLIB = -lfftw $(PKGLIB)
USRLIB = $(PKGLIB) -lfftw
FORTLIB = FORTLIB =
SYSLIB = $(FORTLIB) SYSLIB = $(FORTLIB)
SIZE = size SIZE = size
# Link rule # Link rule

View File

@ -11,16 +11,14 @@ FFTW_INC = ${TACC_FFTW2_INC}
FFTW_LIB = ${TACC_FFTW2_LIB} FFTW_LIB = ${TACC_FFTW2_LIB}
CC = mpiCC CC = mpiCC
CCFLAGS = $(PKGINC) -O -DFFT_FFTW -I${FFTW_INC} CCFLAGS = -O -DFFT_FFTW -I${FFTW_INC} $(PKGINC)
DEPFLAGS = -M DEPFLAGS = -M
LINK = mpiCC LINK = mpiCC
LINKFORT = LINKFORT = -L/opt/apps/intel/10.1/fc/lib
LINKFLAGS = $(PKGPATH) $(LINKFORT) -O -L${FFTW_LIB} LINKFLAGS = -O -L${FFTW_LIB} $(PKGPATH) $(LINKFORT)
USRLIB = $(PKGLIB) ${FFTW_LIB}/libfftw.a USRLIB = ${FFTW_LIB}/libfftw.a $(PKGLIB)
FORTLIB = FORTLIB = -lifcore
SYSLIB = $(FORTLIB) -L/opt/apps/intel/10.1/fc/lib -lifcore SYSLIB = $(FORTLIB)
#SYSLIB = $(FORTLIB) -L/opt/apps/intel/10.1/fc/lib -lifcore (use if linking to MEAM)
ARCHIVE = ar
ARFLAGS = -rc ARFLAGS = -rc
SIZE = size SIZE = size

View File

@ -28,14 +28,14 @@ SHELL = /bin/sh
include Makefile.package include Makefile.package
CC = mpicxx CC = mpicxx
CCFLAGS = $(PKGINC) -O -DFFT_FFTW -I$(FFTW_INCLUDE) CCFLAGS = -O -DFFT_FFTW -I$(FFTW_INCLUDE) $(PKGINC)
DEPFLAGS = -M DEPFLAGS = -M
LINK = mpicxx LINK = mpicxx
LINKFORT = LINKFORT =
LINKFLAGS = $(PKGPATH) $(LINKFORT) -O LINKFLAGS = -O $(PKGPATH) $(LINKFORT)
USRLIB = $(PKGLIB) $(BLASLIB) $(FFTW_LINK_LINE) -lstdc++ USRLIB = $(BLASLIB) $(FFTW_LINK_LINE) -lstdc++ $(PKGLIB)
FORTLIB = FORTLIB =
SYSLIB = $(FORTLIB) -lm SYSLIB = -lm $(FORTLIB)
SIZE = size SIZE = size
ARCHIVE = ar ARCHIVE = ar
ARFLAGS = -rc ARFLAGS = -rc