Commit 0ebea215 authored by athomps's avatar athomps
Browse files

Removed inadvertent changes from previous commit

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5075 f3b2605a-c512-4ea7-a41b-209d697bcdaa
parent a70605cc
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ SHELL = /bin/sh
# generally no need to edit this section
# unless additional compiler/linker flags or libraries needed for your machine

CC =		ccache g++-4
CCFLAGS =	-v -O
CC =		g++4
CCFLAGS =	-O
DEPFLAGS =	-M
LINK =		ccache g++-4
LINKFLAGS =	-v -O
LINK =		g++4
LINKFLAGS =	-O
LIB =           
ARCHIVE =	ar
ARFLAGS =	-rc
@@ -34,7 +34,6 @@ MPI_INC = -I../STUBS
MPI_PATH =
MPI_LIB =	../STUBS/libmpi.a


# FFT library, can be -DFFT_NONE if not using PPPM from kspace package
# INC = -DFFT_FFTW, -DFFT_INTEL, -DFFT_NONE, etc, FFT compiler settings
# PATH = path for FFT library
+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ PACKAGE = asphere class2 colloid dipole dsmc gpu granular \
	  shock srd xtc

PACKUSER = user-ackland user-atc user-cd-eam user-cg-cmm user-eff \
	   user-ewaldn user-imd user-quip user-smd
	   user-ewaldn user-imd user-smd

PACKALL = $(PACKAGE) $(PACKUSER)

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ OBJ = $(SRC:.c=.o)

# System-specific settings

CC =		icc
CC =		g++
CCFLAGS =	-O
ARCHIVE =	ar
ARCHFLAG =	rs