diff --git a/src/MAKE/Makefile.g++ b/src/MAKE/Makefile.g++ index 7bd8b3fd5..744498bab 100755 --- a/src/MAKE/Makefile.g++ +++ b/src/MAKE/Makefile.g++ @@ -1,49 +1,49 @@ # g++ = RedHat Linux box, g++, MPICH, FFTW SHELL = /bin/sh # System-specific settings # LINKFORT & FORTLIB settings can be blank if not using LAMMPS Fortran libs # LINKGPU & GPULIB settings can be blank if not using LAMMPS gpu lib include Makefile.package CC = g++ CCFLAGS = -g -O -DFFT_FFTW -DLAMMPS_GZIP -DMPICH_IGNORE_CXX_SEEK $(PKGINC) DEPFLAGS = -M LINK = g++ LINKFORT = -L/opt/intel/fce/10.0.023/lib #LINKGPU = -L/usr/local/cuda/lib64 LINKFLAGS = -g -O $(PKGPATH) $(LINKFORT) $(LINKGPU) -USRLIB = -lfftw -lmpich -llapack $(PKGLIB) +USRLIB = -lfftw -lmpich $(PKGLIB) FORTLIB = -lifcore -lsvml -lompstub -limf #GPULIB = -lcudart SYSLIB = -lpthread $(FORTLIB) $(GPULIB) ARCHIVE = ar ARFLAGS = -rc SIZE = size # Link target $(EXE): $(OBJ) $(LINK) $(LINKFLAGS) $(OBJ) $(USRLIB) $(SYSLIB) -o $(EXE) $(SIZE) $(EXE) # Library target lib: $(OBJ) $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ) # Compilation rules %.o:%.cpp $(CC) $(CCFLAGS) -c $< %.d:%.cpp $(CC) $(CCFLAGS) $(DEPFLAGS) $< > $@ # Individual dependencies DEPENDS = $(OBJ:.o=.d) include $(DEPENDS) diff --git a/src/MAKE/Makefile.linux b/src/MAKE/Makefile.linux index 20ff2d762..f4eb4af59 100755 --- a/src/MAKE/Makefile.linux +++ b/src/MAKE/Makefile.linux @@ -1,49 +1,49 @@ # linux = RedHat Linux box, Intel icc, MPICH2, FFTW SHELL = /bin/sh # System-specific settings # LINKFORT & FORTLIB settings can be blank if not using LAMMPS Fortran libs # LINKGPU & GPULIB settings can be blank if not using LAMMPS gpu lib include Makefile.package CC = icc CCFLAGS = -O -DFFT_FFTW -DLAMMPS_GZIP -DMPICH_IGNORE_CXX_SEEK $(PKGINC) DEPFLAGS = -M LINK = icc LINKFORT = -L/opt/intel/fce/10.0.023/lib #LINKGPU = -L/usr/local/cuda/lib64// LINKFLAGS = -O $(PKGPATH) $(LINKFORT) $(LINKGPU) -USRLIB = -lfftw -lmpich -llapack $(PKGLIB) +USRLIB = -lfftw -lmpich $(PKGLIB) FORTLIB = -lifcore -lsvml -lompstub -limf #GPULIB = -lcudart SYSLIB = -lpthread -lstdc++ $(FORTLIB) $(GPULIB) ARCHIVE = ar ARFLAGS = -rc SIZE = size # Link target $(EXE): $(OBJ) $(LINK) $(LINKFLAGS) $(OBJ) $(USRLIB) $(SYSLIB) -o $(EXE) $(SIZE) $(EXE) # Library target lib: $(OBJ) $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ) # Compilation rules %.o:%.cpp $(CC) $(CCFLAGS) -c $< %.d:%.cpp $(CC) $(CCFLAGS) $(DEPFLAGS) $< > $@ # Individual dependencies DEPENDS = $(OBJ:.o=.d) include $(DEPENDS)