diff --git a/lib/reax/Makefile.g77 b/lib/reax/Makefile.g77 deleted file mode 100755 index ac5fc1214a..0000000000 --- a/lib/reax/Makefile.g77 +++ /dev/null @@ -1,61 +0,0 @@ -# * -# *_________________________________________________________________________* -# * Fortran Library for Reactive Force Field * -# * DESCRIPTION: SEE READ-ME * -# * FILE NAME: Makefile * -# * CONTRIBUTING AUTHORS: Hansohl Cho(MIT), Aidan Thompson(SNL) * -# * and Greg Wagner(SNL) * -# * CONTACT: hansohl@mit.edu, athompson@sandia.gov, gjwagne@sandia.gov * -# *_________________________________________________________________________*/ - -# To compile and link LAMMPS to the reax library generated by this Makefile, -# you need to first install the reax package (make yes-reax), after which the -# file Makefile.package should look something like: - -# PKG_INC = -I../../lib/reax -# PKG_PATH = -L../../lib/reax -# PKG_LIB = -lreax - -# PKG_SYSPATH = $(reax_SYSPATH) -# PKG_SYSLIB = $(reax_SYSLIB) - -# The reax_SYSPATH and reax_SYSLIB variables contain compiler options -# giving the paths of needed FORTRAN libraries, and their names, respectively -# - -SHELL = /bin/sh - -# ------ FILES ------ - -SRC = reax_connect.F reax_inout.F reax_lammps.F reax_poten.F reax_reac.F reax_charges.F - -HEADERFILES = reax_defs.h *.blk - -# ------ DEFINITIONS ------ - -LIB = libreax.a -OBJ = $(SRC:.F=.o) - -# ------ SETTINGS ------ - -F90 = g77 -F90FLAGS = -O -fPIC -ARCHIVE = ar -ARCHFLAG = -rc -USRLIB = -SYSLIB = - -# ------ MAKE PROCEDURE ------ - -lib: $(OBJ) - $(ARCHIVE) $(ARFLAGS) $(LIB) $(OBJ) - -# ------ COMPILE RULES ------ - -%.o:%.F $(HEADERFILES) - $(F90) $(F90FLAGS) -c $< - -# ------ CLEAN ------ - -clean: - -rm *.o $(LIB) diff --git a/lib/reax/Makefile.g95 b/lib/reax/Makefile.g95 index a4c2410d75..55c40daa00 100755 --- a/lib/reax/Makefile.g95 +++ b/lib/reax/Makefile.g95 @@ -8,23 +8,12 @@ # * CONTACT: hansohl@mit.edu, athompson@sandia.gov, gjwagne@sandia.gov * # *_________________________________________________________________________*/ -# To compile and link LAMMPS to the reax library generated by this Makefile, -# you need to first install the reax package (make yes-reax), after which the -# file Makefile.package should look something like: - -# PKG_INC = -I../../lib/reax -# PKG_PATH = -L../../lib/reax -# PKG_LIB = -lreax - -# PKG_SYSPATH = $(reax_SYSPATH) -# PKG_SYSLIB = $(reax_SYSLIB) - -# The reax_SYSPATH and reax_SYSLIB variables contain compiler options -# giving the paths of needed FORTRAN libraries, and their names, respectively -# - SHELL = /bin/sh +# which file will be copied to Makefile.lammps + +EXTRAMAKE = Makefile.lammps.gfortran + # ------ FILES ------ SRC = reax_connect.F reax_inout.F reax_lammps.F reax_poten.F reax_reac.F reax_charges.F @@ -49,6 +38,7 @@ SYSLIB = lib: $(OBJ) $(ARCHIVE) $(ARFLAGS) $(LIB) $(OBJ) + @cp $(EXTRAMAKE) Makefile.lammps # ------ COMPILE RULES ------ diff --git a/lib/reax/Makefile.gfortran b/lib/reax/Makefile.gfortran index 5bbfc2428b..b2b16fcc57 100755 --- a/lib/reax/Makefile.gfortran +++ b/lib/reax/Makefile.gfortran @@ -8,27 +8,12 @@ # * CONTACT: hansohl@mit.edu, athompson@sandia.gov, gjwagne@sandia.gov * # *_________________________________________________________________________*/ -# To compile and link LAMMPS to the reax library generated by this Makefile, -# you need to first install the reax package (make yes-reax), after which the -# file Makefile.package should look something like: - -# PKG_INC = -I../../lib/reax -# PKG_PATH = -L../../lib/reax -# PKG_LIB = -lreax - -# PKG_SYSPATH = $(reax_SYSPATH) -# PKG_SYSLIB = $(reax_SYSLIB) - -# The reax_SYSPATH and reax_SYSLIB variables contain compiler options -# giving the paths of needed FORTRAN libraries, and their names, respectively -# -# For Makefile.gfortran, try -# -# reax_SYSPATH = -L/usr/lib -# reax_SYSLIB = -lgfortran - SHELL = /bin/sh +# which file will be copied to Makefile.lammps + +EXTRAMAKE = Makefile.lammps.gfortran + # ------ FILES ------ SRC = reax_connect.F reax_inout.F reax_lammps.F reax_poten.F reax_reac.F reax_charges.F @@ -53,6 +38,7 @@ SYSLIB = lib: $(OBJ) $(ARCHIVE) $(ARFLAGS) $(LIB) $(OBJ) + @cp $(EXTRAMAKE) Makefile.lammps # ------ COMPILE RULES ------ diff --git a/lib/reax/Makefile.ifort b/lib/reax/Makefile.ifort index 3e2465aa16..1760cb9c6a 100644 --- a/lib/reax/Makefile.ifort +++ b/lib/reax/Makefile.ifort @@ -8,27 +8,12 @@ # * CONTACT: hansohl@mit.edu, athompson@sandia.gov, gjwagne@sandia.gov * # *_________________________________________________________________________*/ -# To compile and link LAMMPS to the reax library generated by this Makefile, -# you need to first install the reax package (make yes-reax), after which the -# file Makefile.package should look something like: - -# PKG_INC = -I../../lib/reax -# PKG_PATH = -L../../lib/reax -# PKG_LIB = -lreax - -# PKG_SYSPATH = $(reax_SYSPATH) -# PKG_SYSLIB = $(reax_SYSLIB) - -# The reax_SYSPATH and reax_SYSLIB variables contain compiler options -# giving the paths of needed FORTRAN libraries, and their names, respectively -# -# For Makefile.ifort, try -# -# reax_SYSPATH = -L/opt/intel/fce/10.0.023/lib -# reax_SYSLIB = -lifcore -lsvml -lompstub -limf - SHELL = /bin/sh +# which file will be copied to Makefile.lammps + +EXTRAMAKE = Makefile.lammps.ifort + # ------ FILES ------ SRC = reax_connect.F reax_inout.F reax_lammps.F reax_poten.F reax_reac.F reax_charges.F @@ -53,6 +38,7 @@ SYSLIB = lib: $(OBJ) $(ARCHIVE) $(ARFLAGS) $(LIB) $(OBJ) + @cp $(EXTRAMAKE) Makefile.lammps # ------ COMPILE RULES ------ diff --git a/lib/reax/Makefile.lammps b/lib/reax/Makefile.lammps deleted file mode 100644 index 3586fe6161..0000000000 --- a/lib/reax/Makefile.lammps +++ /dev/null @@ -1,5 +0,0 @@ -# Settings that the LAMMPS build will import when this package library is used - -reax_SYSINC = -reax_SYSLIB = -lifcore -lsvml -lompstub -limf -reax_SYSPATH = -L/opt/intel/fce/10.0.023/lib diff --git a/lib/reax/Makefile.pgf90 b/lib/reax/Makefile.pgf90 index df8d13209d..dfc17eca11 100644 --- a/lib/reax/Makefile.pgf90 +++ b/lib/reax/Makefile.pgf90 @@ -8,23 +8,12 @@ # * CONTACT: hansohl@mit.edu, athompson@sandia.gov, gjwagne@sandia.gov * # *_________________________________________________________________________*/ -# To compile and link LAMMPS to the reax library generated by this Makefile, -# you need to first install the reax package (make yes-reax), after which the -# file Makefile.package should look something like: - -# PKG_INC = -I../../lib/reax -# PKG_PATH = -L../../lib/reax -# PKG_LIB = -lreax - -# PKG_SYSPATH = $(reax_SYSPATH) -# PKG_SYSLIB = $(reax_SYSLIB) - -# The reax_SYSPATH and reax_SYSLIB variables contain compiler options -# giving the paths of needed FORTRAN libraries, and their names, respectively -# - SHELL = /bin/sh +# which file will be copied to Makefile.lammps + +EXTRAMAKE = Makefile.lammps.pgf90 + # ------ FILES ------ SRC = reax_connect.F reax_inout.F reax_lammps.F reax_poten.F reax_reac.F reax_charges.F @@ -49,6 +38,7 @@ SYSLIB = lib: $(OBJ) $(ARCHIVE) $(ARFLAGS) $(LIB) $(OBJ) + @cp $(EXTRAMAKE) Makefile.lammps # ------ COMPILE RULES ------ diff --git a/lib/reax/Makefile.redsky b/lib/reax/Makefile.redsky index 4b37fcc61d..f51a15d1f1 100644 --- a/lib/reax/Makefile.redsky +++ b/lib/reax/Makefile.redsky @@ -8,28 +8,12 @@ # * CONTACT: hansohl@mit.edu, athompson@sandia.gov, gjwagne@sandia.gov * # *_________________________________________________________________________*/ -# To compile and link LAMMPS to the reax library generated by this Makefile, -# you need to first install the reax package (make yes-reax), after which the -# file Makefile.package should look something like: - -# PKG_INC = -I../../lib/reax -# PKG_PATH = -L../../lib/reax -# PKG_LIB = -lreax - -# PKG_SYSPATH = $(reax_SYSPATH) -# PKG_SYSLIB = $(reax_SYSLIB) - -# The reax_SYSPATH and reax_SYSLIB variables contain compiler options -# giving the paths of needed FORTRAN libraries, and their names, respectively -# -# For Makefile.redsky, try -# -# reax_SYSPATH = -L/projects/global/x86_64/compilers/intel/intel-11.1-cprof-06 -4/lib/intel64 -# reax_SYSLIB = -lifcore -lsvml -lompstub -limf - SHELL = /bin/sh +# which file will be copied to Makefile.lammps + +EXTRAMAKE = Makefile.lammps.ifort + # ------ FILES ------ SRC = reax_connect.F reax_inout.F reax_lammps.F reax_poten.F reax_reac.F reax_charges.F @@ -54,6 +38,7 @@ SYSLIB = lib: $(OBJ) $(ARCHIVE) $(ARFLAGS) $(LIB) $(OBJ) + @cp $(EXTRAMAKE) Makefile.lammps # ------ COMPILE RULES ------ diff --git a/lib/reax/Makefile.tbird b/lib/reax/Makefile.tbird index 6bf8baae3a..f51a15d1f1 100644 --- a/lib/reax/Makefile.tbird +++ b/lib/reax/Makefile.tbird @@ -8,27 +8,12 @@ # * CONTACT: hansohl@mit.edu, athompson@sandia.gov, gjwagne@sandia.gov * # *_________________________________________________________________________*/ -# To compile and link LAMMPS to the reax library generated by this Makefile, -# you need to first install the reax package (make yes-reax), after which the -# file Makefile.package should look something like: - -# PKG_INC = -I../../lib/reax -# PKG_PATH = -L../../lib/reax -# PKG_LIB = -lreax - -# PKG_SYSPATH = $(reax_SYSPATH) -# PKG_SYSLIB = $(reax_SYSLIB) - -# The reax_SYSPATH and reax_SYSLIB variables contain compiler options -# giving the paths of needed FORTRAN libraries, and their names, respectively -# -# For Makefile.tbird, try -# -# reax_SYSPATH = -L/projects/global/x86_64/compilers/intel/intel-11.0-cprof-074/lib/intel64 -# reax_SYSLIB = -lm -lsvml -lifport -lifcore - SHELL = /bin/sh +# which file will be copied to Makefile.lammps + +EXTRAMAKE = Makefile.lammps.ifort + # ------ FILES ------ SRC = reax_connect.F reax_inout.F reax_lammps.F reax_poten.F reax_reac.F reax_charges.F @@ -53,6 +38,7 @@ SYSLIB = lib: $(OBJ) $(ARCHIVE) $(ARFLAGS) $(LIB) $(OBJ) + @cp $(EXTRAMAKE) Makefile.lammps # ------ COMPILE RULES ------