From f620bcc4f97f3db9b63f384f72b2ce5c0b53536a Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Thu, 10 Mar 2016 16:30:39 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14734
f3b2605a-c512-4ea7-a41b-209d697bcdaa
---
src/MAKE/MACHINES/Makefile.beacon | 116 ----------------
src/MAKE/MACHINES/Makefile.bgl | 121 -----------------
src/MAKE/MACHINES/Makefile.bgq | 56 --------
src/MAKE/MACHINES/Makefile.bgq.details | 118 ----------------
src/MAKE/MACHINES/Makefile.chama | 115 ----------------
src/MAKE/MACHINES/Makefile.cygwin | 115 ----------------
src/MAKE/MACHINES/Makefile.glory | 132 ------------------
src/MAKE/MACHINES/Makefile.jaguar | 115 ----------------
src/MAKE/MACHINES/Makefile.mac | 115 ----------------
src/MAKE/MACHINES/Makefile.mac_mpi | 118 ----------------
src/MAKE/MACHINES/Makefile.mingw32-cross | 120 -----------------
src/MAKE/MACHINES/Makefile.mingw32-cross-mpi | 120 -----------------
src/MAKE/MACHINES/Makefile.mingw64-cross | 120 -----------------
src/MAKE/MACHINES/Makefile.mingw64-cross-mpi | 120 -----------------
src/MAKE/MACHINES/Makefile.myrinet | 115 ----------------
src/MAKE/MACHINES/Makefile.power | 116 ----------------
src/MAKE/MACHINES/Makefile.redsky | 135 -------------------
src/MAKE/MACHINES/Makefile.serial | 115 ----------------
src/MAKE/MACHINES/Makefile.stampede | 114 ----------------
src/MAKE/MACHINES/Makefile.storm | 116 ----------------
src/MAKE/MACHINES/Makefile.tacc | 118 ----------------
src/MAKE/MACHINES/Makefile.ubuntu | 119 ----------------
src/MAKE/MACHINES/Makefile.ubuntu_simple | 118 ----------------
src/MAKE/MACHINES/Makefile.xe6 | 116 ----------------
src/MAKE/MACHINES/Makefile.xt3 | 117 ----------------
src/MAKE/MACHINES/Makefile.xt5 | 116 ----------------
src/MAKE/Makefile.mpi | 115 ----------------
src/MAKE/Makefile.serial | 115 ----------------
src/MAKE/OPTIONS/Makefile.fftw | 115 ----------------
src/MAKE/OPTIONS/Makefile.intel_cpu | 118 ----------------
src/MAKE/OPTIONS/Makefile.intel_knl | 115 ----------------
src/MAKE/OPTIONS/Makefile.intel_phi | 118 ----------------
src/MAKE/OPTIONS/Makefile.jpeg | 115 ----------------
src/MAKE/OPTIONS/Makefile.knl | 116 ----------------
src/MAKE/OPTIONS/Makefile.kokkos_cuda | 120 -----------------
src/MAKE/OPTIONS/Makefile.kokkos_omp | 116 ----------------
src/MAKE/OPTIONS/Makefile.kokkos_phi | 117 ----------------
src/MAKE/OPTIONS/Makefile.mpi_fastmgpt | 113 ----------------
src/MAKE/OPTIONS/Makefile.mpich_g++ | 115 ----------------
src/MAKE/OPTIONS/Makefile.mpich_icc | 115 ----------------
src/MAKE/OPTIONS/Makefile.mpich_native_g++ | 115 ----------------
src/MAKE/OPTIONS/Makefile.mpich_native_icc | 115 ----------------
src/MAKE/OPTIONS/Makefile.omp | 115 ----------------
src/MAKE/OPTIONS/Makefile.ompi_g++ | 116 ----------------
src/MAKE/OPTIONS/Makefile.ompi_icc | 116 ----------------
src/MAKE/OPTIONS/Makefile.ompi_native_g++ | 115 ----------------
src/MAKE/OPTIONS/Makefile.ompi_native_icc | 115 ----------------
src/MAKE/OPTIONS/Makefile.opt | 115 ----------------
src/MAKE/OPTIONS/Makefile.pgi | 116 ----------------
src/MAKE/OPTIONS/Makefile.png | 115 ----------------
src/MAKE/OPTIONS/Makefile.serial_icc | 115 ----------------
src/MAKE/README | 106 ---------------
src/Make.py | 95 ++++++++++++-
src/Makefile | 4 +-
54 files changed, 93 insertions(+), 6019 deletions(-)
delete mode 100755 src/MAKE/MACHINES/Makefile.beacon
delete mode 100644 src/MAKE/MACHINES/Makefile.bgl
delete mode 100644 src/MAKE/MACHINES/Makefile.bgq
delete mode 100644 src/MAKE/MACHINES/Makefile.bgq.details
delete mode 100644 src/MAKE/MACHINES/Makefile.chama
delete mode 100644 src/MAKE/MACHINES/Makefile.cygwin
delete mode 100644 src/MAKE/MACHINES/Makefile.glory
delete mode 100644 src/MAKE/MACHINES/Makefile.jaguar
delete mode 100755 src/MAKE/MACHINES/Makefile.mac
delete mode 100755 src/MAKE/MACHINES/Makefile.mac_mpi
delete mode 100644 src/MAKE/MACHINES/Makefile.mingw32-cross
delete mode 100644 src/MAKE/MACHINES/Makefile.mingw32-cross-mpi
delete mode 100644 src/MAKE/MACHINES/Makefile.mingw64-cross
delete mode 100644 src/MAKE/MACHINES/Makefile.mingw64-cross-mpi
delete mode 100755 src/MAKE/MACHINES/Makefile.myrinet
delete mode 100644 src/MAKE/MACHINES/Makefile.power
delete mode 100644 src/MAKE/MACHINES/Makefile.redsky
delete mode 100755 src/MAKE/MACHINES/Makefile.serial
delete mode 100755 src/MAKE/MACHINES/Makefile.stampede
delete mode 100644 src/MAKE/MACHINES/Makefile.storm
delete mode 100644 src/MAKE/MACHINES/Makefile.tacc
delete mode 100644 src/MAKE/MACHINES/Makefile.ubuntu
delete mode 100644 src/MAKE/MACHINES/Makefile.ubuntu_simple
delete mode 100644 src/MAKE/MACHINES/Makefile.xe6
delete mode 100644 src/MAKE/MACHINES/Makefile.xt3
delete mode 100644 src/MAKE/MACHINES/Makefile.xt5
delete mode 100755 src/MAKE/Makefile.mpi
delete mode 100755 src/MAKE/Makefile.serial
delete mode 100755 src/MAKE/OPTIONS/Makefile.fftw
delete mode 100755 src/MAKE/OPTIONS/Makefile.intel_cpu
delete mode 100755 src/MAKE/OPTIONS/Makefile.intel_knl
delete mode 100755 src/MAKE/OPTIONS/Makefile.intel_phi
delete mode 100755 src/MAKE/OPTIONS/Makefile.jpeg
delete mode 100755 src/MAKE/OPTIONS/Makefile.knl
delete mode 100755 src/MAKE/OPTIONS/Makefile.kokkos_cuda
delete mode 100644 src/MAKE/OPTIONS/Makefile.kokkos_omp
delete mode 100644 src/MAKE/OPTIONS/Makefile.kokkos_phi
delete mode 100644 src/MAKE/OPTIONS/Makefile.mpi_fastmgpt
delete mode 100755 src/MAKE/OPTIONS/Makefile.mpich_g++
delete mode 100755 src/MAKE/OPTIONS/Makefile.mpich_icc
delete mode 100755 src/MAKE/OPTIONS/Makefile.mpich_native_g++
delete mode 100755 src/MAKE/OPTIONS/Makefile.mpich_native_icc
delete mode 100755 src/MAKE/OPTIONS/Makefile.omp
delete mode 100755 src/MAKE/OPTIONS/Makefile.ompi_g++
delete mode 100755 src/MAKE/OPTIONS/Makefile.ompi_icc
delete mode 100755 src/MAKE/OPTIONS/Makefile.ompi_native_g++
delete mode 100755 src/MAKE/OPTIONS/Makefile.ompi_native_icc
delete mode 100755 src/MAKE/OPTIONS/Makefile.opt
delete mode 100644 src/MAKE/OPTIONS/Makefile.pgi
delete mode 100755 src/MAKE/OPTIONS/Makefile.png
delete mode 100755 src/MAKE/OPTIONS/Makefile.serial_icc
delete mode 100644 src/MAKE/README
diff --git a/src/MAKE/MACHINES/Makefile.beacon b/src/MAKE/MACHINES/Makefile.beacon
deleted file mode 100755
index f547c2e7f7..0000000000
--- a/src/MAKE/MACHINES/Makefile.beacon
+++ /dev/null
@@ -1,116 +0,0 @@
-# linux = RedHat Linux box, Intel icc, MPICH2, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpiicpc -openmp -DLMP_INTEL_OFFLOAD -DLAMMPS_MEMALIGN=64
-MIC_OPT = -offload-option,mic,compiler,"-fp-model fast=2 -mGLOB_default_function_attrs=\"gather_scatter_loop_unroll=4\""
-CCFLAGS = -O3 -xAVX -fno-alias -ansi-alias -restrict -override-limits $(MIC_OPT)
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpiicpc -openmp
-LINKFLAGS = -O3 -xAVX
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP -DLAMMPS_JPEG
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_MKL -DFFT_SINGLE -I$(MKLROOT)
-FFT_PATH =
-FFT_LIB = -L$(MKLROOT) -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB = -ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.bgl b/src/MAKE/MACHINES/Makefile.bgl
deleted file mode 100644
index 47e0842163..0000000000
--- a/src/MAKE/MACHINES/Makefile.bgl
+++ /dev/null
@@ -1,121 +0,0 @@
-# bgl = LLNL Blue Gene Light machine, xlC, native MPI, FFTW
-
-SHELL = /bin/sh
-.SUFFIXES: .cpp .u
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = /opt/ibmcmp/vacpp/7.0/bin/blrts_xlC
-CCFLAGS = -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = /opt/ibmcmp/vacpp/7.0/bin/blrts_xlC
-LINKFLAGS = -O \
- -L/opt/ibmcmp/xlf/9.1/blrts_lib \
- -L/opt/ibmcmp/vacpp/7.0/blrts_lib \
- -L/bgl/local/lib \
- -L/bgl/local/bglfftwgel-2.1.5.pre5/lib
-LIB = -lxlopt -lxlomp_ser -lxl -lxlfmath -lm \
- -lmsglayer.rts -lrts.rts -ldevices.rts -lmassv
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX
-MPI_PATH =
-MPI_LIB = -lmpich.rts
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_FFTW
-FFT_PATH =
-FFT_LIB = -lfftw
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.bgq b/src/MAKE/MACHINES/Makefile.bgq
deleted file mode 100644
index c4081b04a9..0000000000
--- a/src/MAKE/MACHINES/Makefile.bgq
+++ /dev/null
@@ -1,56 +0,0 @@
-# bgq = IBM Blue Gene/Q, multiple compiler options, native MPI, ALCF FFTW2
-
-SHELL = /bin/bash
-.SUFFIXES: .cpp .u
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-# select which compiler by editing Makefile.bgq.details
-
-include ../MAKE/Makefile.bgq.details
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.bgq.details b/src/MAKE/MACHINES/Makefile.bgq.details
deleted file mode 100644
index 8c81bd1cfb..0000000000
--- a/src/MAKE/MACHINES/Makefile.bgq.details
+++ /dev/null
@@ -1,118 +0,0 @@
-# multiple compiler options for BGQ
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-# uncomment one and only one of the following three lines
-# to choose a compiler toolchain
-
-#COMPILER = GCC
-#COMPILER = LLVM
-COMPILER = XLC
-
-ifeq ($(COMPILER),XLC)
-CC = /bgsys/drivers/ppcfloor/comm/xl.ndebug/bin/mpixlcxx_r
-CCFLAGS = -O3 -qarch=qp -qtune=qp -qsmp=omp -qsimd=auto -qhot=level=2 -qprefetch -qunroll=yes
-FC = /bgsys/drivers/ppcfloor/comm/xl.ndebug/bin/mpixlf90_r
-FFLAGS = -O3 -qarch=qp -qtune=qp -qsimd=auto -qhot=level=2 -qprefetch -qunroll=yes -qsmp=omp -qextname -qnosave
-DEPFLAGS = -M -qmakedep=gcc
-endif
-
-ifeq ($(COMPILER),GCC)
-CC = /bgsys/drivers/ppcfloor/comm/gcc.legacy/bin/mpicxx
-CCFLAGS = -O3 -fopenmp
-FC = /bgsys/drivers/ppcfloor/comm/gcc.legacy/bin/mpif90
-FFLAGS = -O3 -fopenmp
-DEPFLAGS = -M
-endif
-
-ifeq ($(COMPILER),LLVM)
-#CC = bgclang++
-CC = /home/projects/llvm/mpi/bgclang/bin/mpiclang++
-CCFLAGS = -O3 -fopenmp
-DEPFLAGS = -M
-FC = /bin/false
-FFLAGS = LLVM does not have a Fortran front-end!
-endif
-
-LINK = $(CC)
-LINKFLAGS = $(CCFLAGS)
-
-ifeq ($(COMPILER),XLC)
- MASS_LIB = ${IBM_MAIN_DIR}/xlmass/bg/7.3/bglib64
- XLF_LIB = ${IBM_MAIN_DIR}/xlf/bg/14.1/bglib64
- XLSMP_LIB = ${IBM_MAIN_DIR}/xlsmp/bg/3.1/bglib64
- LIB += -L${MASS_LIB} -L${XLF_LIB} -L${XLSMP_LIB}
- LIB += -lmassv -lmass
- LIB += -lxlf90_r -lxlsmp -lxlopt -lxlfmath -lxl
-endif
-
-ifeq ($(COMPILER),GCC)
-# libm is definitely slower than libmass...
- LIB += -lm -lgfortran
-endif
-
-ifeq ($(COMPILER),LLVM)
- SLEEF_DIR = /home/projects/llvm/sleef
- LIB += -L${SLEEF_DIR}/lib -lsleef
-endif
-
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-
-# BGQ should not use shared libraries
-
-SHFLAGS =
-SHLIBFLAGS =
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =
-MPI_PATH =
-MPI_LIB =
-
-MPI_INC += -DMPICH_SKIP_MPICXX
-MPI_LIB += #/home/jhammond/OSPRI/branches/marpn/wrap/libmpiarbrpn.a
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -I/soft/libraries/alcf/current/xl/FFTW2/include -DFFT_FFTW -DFFTW_SIZE
-FFT_PATH = #/soft/libraries/alcf/current/xl/FFTW2
-FFT_LIB = -L/soft/libraries/alcf/current/xl/FFTW2/lib -ldfftw
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
diff --git a/src/MAKE/MACHINES/Makefile.chama b/src/MAKE/MACHINES/Makefile.chama
deleted file mode 100644
index ef6d25ebc8..0000000000
--- a/src/MAKE/MACHINES/Makefile.chama
+++ /dev/null
@@ -1,115 +0,0 @@
-# chama - Intel SandyBridge, mpic++, openmpi, no FFTW
-
-# need to load the following modules:
-# 1) intel/12.1
-# 2) openmpi-intel/1.4
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpic++
-CCFLAGS = -O3 -axAVX -funroll-loops -fstrict-aliasing -openmp
-DEPFLAGS = -M
-LINK = mpic++
-LINKFLAGS = -O3 -axAVX -openmp
-LIB = -lstdc++
-ARCHIVE = ar
-ARFLAGS = -rcsv
-SIZE = size
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-#FFT_INC = -DFFT_FFTW -I${FFTW_INCLUDE}
-#FFT_PATH = -L${FFTW_LIB}
-#FFT_LIB = -lfftw
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.cygwin b/src/MAKE/MACHINES/Makefile.cygwin
deleted file mode 100644
index 41e9d811d4..0000000000
--- a/src/MAKE/MACHINES/Makefile.cygwin
+++ /dev/null
@@ -1,115 +0,0 @@
-# cygwin = Windows Cygwin, mpicxx, MPICH, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpicxx
-CCFLAGS = -O
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpicxx
-LINKFLAGS = -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX
-MPI_PATH = -L/cygdrive/c/cygwin/mpich2-1.0.4p1/lib
-MPI_LIB = -lmpich
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_FFTW -I/cygdrive/c/cygwin/usr/local/include
-FFT_PATH = -L/cygdrive/c/cygwin/usr/local/lib
-FFT_LIB = -lfftw
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.glory b/src/MAKE/MACHINES/Makefile.glory
deleted file mode 100644
index 154c194b4d..0000000000
--- a/src/MAKE/MACHINES/Makefile.glory
+++ /dev/null
@@ -1,132 +0,0 @@
-# glory = Linux cluster with 4-way quad cores, Intel mpicxx, native MPI, FFTW
-
-SHELL = /bin/sh
-
-# this Makefile builds LAMMPS for mvapich running on Glory
-# to invoke this Makefile, you need these modules loaded:
-# compilers/intel-11.1-f064-c064
-# mpi/mvapich-1.1_intel-11.1-f064-c064
-# libraries/fftw-2.1.5
-# you can determine which modules are loaded by typing:
-# module list
-# these modules are not the default ones, but can be enabled by
-# lines like this in your .cshrc or other start-up shell file
-# or by typing them before you build LAMMPS:
-# module swap mpi misc/env-mvapich
-# module load compilers/intel-11.1-f064-c064
-# module load mpi/mvapich-1.1_intel-11.1-f064-c064
-# module load libraries/fftw-2.1.5
-# these same modules need to be loaded to submit a LAMMPS job,
-# either interactively or via a batch script
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpicxx
-CCFLAGS = -O
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpicxx
-LINKFLAGS = -O
-LIB = -lstdc++ -lm
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_FFTW -I${FFTW_INCLUDE}
-FFT_PATH = -L${FFTW_LIB}
-FFT_LIB = -lfftw
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.jaguar b/src/MAKE/MACHINES/Makefile.jaguar
deleted file mode 100644
index cc550becbb..0000000000
--- a/src/MAKE/MACHINES/Makefile.jaguar
+++ /dev/null
@@ -1,115 +0,0 @@
-# jaguar = ORNL Jaguar Cray XT5, CC, native MPICH, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CXX = CC
-CCFLAGS = -g -O
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = $(CXX)
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP -DNODE_PARTITION
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX
-MPI_PATH =
-MPI_LIB = -lmpich -lpthread
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_FFTW3 -I$(FFTW_INC)
-FFT_PATH = -L$(FFTW_DIR)
-FFT_LIB = -lfftw3
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.mac b/src/MAKE/MACHINES/Makefile.mac
deleted file mode 100755
index 99420e6e1f..0000000000
--- a/src/MAKE/MACHINES/Makefile.mac
+++ /dev/null
@@ -1,115 +0,0 @@
-# mac = Apple PowerBook G4 laptop, c++, no MPI, FFTW 2.1.5
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = c++
-CCFLAGS = -O
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = c++
-LINKFLAGS = -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -I../STUBS
-MPI_PATH = -L../STUBS
-MPI_LIB = -lmpi_stubs
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_FFTW
-FFT_PATH =
-FFT_LIB = -lfftw
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.mac_mpi b/src/MAKE/MACHINES/Makefile.mac_mpi
deleted file mode 100755
index fc8bf69de0..0000000000
--- a/src/MAKE/MACHINES/Makefile.mac_mpi
+++ /dev/null
@@ -1,118 +0,0 @@
-# mac_mpi = Apple laptop, MacPorts Open MPI 1.4.3, gcc 4.8, fftw, jpeg
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# generally no need to edit this section
-# unless additional compiler/linker flags or libraries needed for your machine
-
-CC = /opt/local/bin/mpicxx-openmpi-mp
-CCFLAGS = -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = /opt/local/bin/mpicxx-openmpi-mp
-LINKFLAGS = -O3
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP -DLAMMPS_JPEG
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DOMPI_SKIP_MPICXX
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFTW = /usr/local
-
-FFT_INC = -DFFT_FFTW -I${FFTW}/include
-FFT_PATH = -L${FFTW}/lib
-FFT_LIB = -lfftw
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC = -I/opt/local/include
-JPG_PATH = -L/opt/local/lib
-JPG_LIB = -ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.mingw32-cross b/src/MAKE/MACHINES/Makefile.mingw32-cross
deleted file mode 100644
index 66366cdc7c..0000000000
--- a/src/MAKE/MACHINES/Makefile.mingw32-cross
+++ /dev/null
@@ -1,120 +0,0 @@
-# mingw32-cross = Win 32-bit, gcc-4.7.1, MinGW, internal FFT, no MPI, OpenMP
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = i686-w64-mingw32-g++
-CCFLAGS = -O3 -march=i686 -mtune=generic -mfpmath=387 -mpc64 -fopenmp \
- -ffast-math -fstrict-aliasing -Wall -W -Wno-uninitialized
-
-SHFLAGS = # -fPIC (not needed on windows, all code is PIC)
-DEPFLAGS = -M
-
-LINK = i686-w64-mingw32-g++ -static
-LINKFLAGS = -O2 -march=i686 -mtune=generic -mfpmath=387 -mpc64 -fopenmp
-LIB = -lwsock32 -static-libgcc -lquadmath -lpsapi
-SIZE = i686-w64-mingw32-size
-
-ARCHIVE = i686-w64-mingw32-ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# name of object file subdir for libraries in lib with leading '/'
-LIBOBJDIR = /Obj_mingw32
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_SMALLSMALL -DLAMMPS_JPEG -DLAMMPS_PNG -DLAMMPS_XDR -DLAMMPS_GZIP -DLAMMPS_FFMPEG
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -I../STUBS
-MPI_PATH = -L../STUBS
-MPI_LIB = -lmpi_mingw32
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manual
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB = -ljpeg -lpng -lz
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.mingw32-cross-mpi b/src/MAKE/MACHINES/Makefile.mingw32-cross-mpi
deleted file mode 100644
index 5205312c81..0000000000
--- a/src/MAKE/MACHINES/Makefile.mingw32-cross-mpi
+++ /dev/null
@@ -1,120 +0,0 @@
-# mingw32-cross-mpi = Win 32-bit, gcc-4.7.1, MinGW, internal FFT, MPICH2, OpenMP
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = i686-w64-mingw32-g++
-CCFLAGS = -O3 -march=i686 -mtune=generic -mfpmath=387 -mpc64 -fopenmp \
- -ffast-math -fstrict-aliasing -Wall -W -Wno-uninitialized
-
-SHFLAGS = # -fPIC (not needed on windows, all code is PIC)
-DEPFLAGS = -M
-
-LINK = i686-w64-mingw32-g++ -static
-LINKFLAGS = -O2 -march=i686 -mtune=generic -mfpmath=387 -mpc64 -fopenmp
-LIB = -lwsock32 -static-libgcc -lquadmath -lpsapi
-SIZE = i686-w64-mingw32-size
-
-ARCHIVE = i686-w64-mingw32-ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# name of object file subdir for libraries in lib with leading '/'
-LIBOBJDIR = /Obj_mingw32-mpi
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_SMALLSMALL -DLAMMPS_JPEG -DLAMMPS_PNG -DLAMMPS_XDR -DLAMMPS_GZIP -DLAMMPS_FFMPEG
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -I../../tools/mingw-cross/mpich2-win32/include -DMPICH_SKIP_MPICXX
-MPI_PATH = -L../../tools/mingw-cross/mpich2-win32/lib
-MPI_LIB = -lmpi
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manual
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB = -ljpeg -lpng -lz
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.mingw64-cross b/src/MAKE/MACHINES/Makefile.mingw64-cross
deleted file mode 100644
index 661d61b069..0000000000
--- a/src/MAKE/MACHINES/Makefile.mingw64-cross
+++ /dev/null
@@ -1,120 +0,0 @@
-# mingw64-cross = Win 64-bit, gcc-4.7.1, MinGW, internal FFT, no MPI, OpenMP
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = x86_64-w64-mingw32-g++
-CCFLAGS = -O3 -march=core2 -mtune=core2 -mpc64 -msse2 -fopenmp \
- -ffast-math -fstrict-aliasing -Wall -W -Wno-uninitialized
-
-SHFLAGS = # -fPIC (not needed on windows, all code is PIC)
-DEPFLAGS = -M
-
-LINK = x86_64-w64-mingw32-g++ -static
-LINKFLAGS = -O2 -march=core2 -mtune=core2 -mpc64 -msse2 -fopenmp
-LIB = -lwsock32 -static-libgcc -lquadmath -lpsapi
-SIZE = x86_64-w64-mingw32-size
-
-ARCHIVE = x86_64-w64-mingw32-ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# name of object file subdir for libraries in lib with leading '/'
-LIBOBJDIR = /Obj_mingw64
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_SMALLBIG -DLAMMPS_JPEG -DLAMMPS_PNG -DLAMMPS_XDR -DLAMMPS_GZIP -DLAMMPS_FFMPEG
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -I../STUBS
-MPI_PATH = -L../STUBS
-MPI_LIB = -lmpi_mingw64
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manual
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB = -ljpeg -lpng -lz
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.mingw64-cross-mpi b/src/MAKE/MACHINES/Makefile.mingw64-cross-mpi
deleted file mode 100644
index ea4211605d..0000000000
--- a/src/MAKE/MACHINES/Makefile.mingw64-cross-mpi
+++ /dev/null
@@ -1,120 +0,0 @@
-# mingw64-cross-mpi = Win 64-bit, gcc-4.7.1, MinGW, internal FFT, MPICH2, OpenMP
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = x86_64-w64-mingw32-g++
-CCFLAGS = -O3 -march=core2 -mtune=core2 -mpc64 -msse2 -fopenmp \
- -ffast-math -fstrict-aliasing -Wall -W -Wno-uninitialized
-
-SHFLAGS = # -fPIC (not needed on windows, all code is PIC)
-DEPFLAGS = -M
-
-LINK = x86_64-w64-mingw32-g++ -static
-LINKFLAGS = -O2 -march=core2 -mtune=core2 -mpc64 -msse2 -fopenmp
-LIB = -lwsock32 -static-libgcc -lquadmath -lpsapi
-SIZE = x86_64-w64-mingw32-size
-
-ARCHIVE = x86_64-w64-mingw32-ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# name of object file subdir for libraries in lib with leading '/'
-LIBOBJDIR = /Obj_mingw64-mpi
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_SMALLBIG -DLAMMPS_JPEG -DLAMMPS_PNG -DLAMMPS_XDR -DLAMMPS_GZIP -DLAMMPS_FFMPEG
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -I../../tools/mingw-cross/mpich2-win64/include -DMPICH_SKIP_MPICXX
-MPI_PATH = -L../../tools/mingw-cross/mpich2-win64/lib
-MPI_LIB = -lmpi
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manual
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB = -ljpeg -lpng -lz
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.myrinet b/src/MAKE/MACHINES/Makefile.myrinet
deleted file mode 100755
index 59f2efb58e..0000000000
--- a/src/MAKE/MACHINES/Makefile.myrinet
+++ /dev/null
@@ -1,115 +0,0 @@
-# myrinet = cluster, g++, myrinet MPI, no FFTs
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = g++
-CCFLAGS = -O
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = G++
-LINKFLAGS = -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -I/opt/mpich-mx/include
-MPI_PATH = -L/opt/mpich-mx/lib -L/opt/mx/lib
-MPI_LIB = -lmpich -lmyriexpress
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_NONE
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.power b/src/MAKE/MACHINES/Makefile.power
deleted file mode 100644
index 14a035dd2a..0000000000
--- a/src/MAKE/MACHINES/Makefile.power
+++ /dev/null
@@ -1,116 +0,0 @@
-# power = IBM Power5+, mpCC_r, native MPI, FFTW
-
-SHELL = /bin/sh
-.SUFFIXES: .cpp .u
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpCC_r
-CCFLAGS = -O3 -qnoipa -qlanglvl=oldmath
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpCC_r
-LINKFLAGS = -O -qnoipa -qlanglvl=oldmath -bmaxdata:0x70000000
-LIB = -lm
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_FFTW -I/scr/oppe/LAMMPS/fftw-2.1.5/include
-FFT_PATH = -L/scr/oppe/LAMMPS/fftw-2.1.5/lib
-FFT_LIB = -lfftw
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.redsky b/src/MAKE/MACHINES/Makefile.redsky
deleted file mode 100644
index a310f56501..0000000000
--- a/src/MAKE/MACHINES/Makefile.redsky
+++ /dev/null
@@ -1,135 +0,0 @@
-# redsky - SUN X6275 nodes, Nehalem procs, mpic++, openmpi, OpenMP, no FFTW
-
-SHELL = /bin/sh
-
-# This Makefile builds LAMMPS for RedSky with OpenMPI.
-# To use this Makefile, you need appropriate modules loaded.
-# You can determine which modules are loaded by typing:
-# module list
-# These modules can be enabled by lines like this in your .cshrc or
-# other start-up shell file or by typing them before you build LAMMPS:
-# module load mpi/openmpi-1.4.2_oobpr_intel-11.1-f064-c064
-# module load libraries/intel-mkl-11.1.064
-# module load libraries/fftw-2.1.5_openmpi-1.4.2_oobpr_intel-11.1-f064-c064
-# These same modules need to be loaded to submit a LAMMPS job,
-# either interactively or via a batch script.
-
-# IMPORTANT NOTE:
-# to run efficiently on RedSky, use the "numa_wrapper" mpiexec option,
-# to insure proceses and their memory are locked to specific cores
-# e.g. in your batch script:
-# nodes=$SLURM_JOB_NUM_NODES
-# cores=8
-# mpiexec --npernode $cores numa_wrapper --ppn $cores lmp_redsky < in > out
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpic++ -fopenmp
-CCFLAGS = -O2 -xsse4.2 -funroll-loops -fstrict-aliasing
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpic++ -fopenmp
-LINKFLAGS = -O -xsse4.2
-LIB = -lstdc++
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rcsv
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-#FFT_INC = -DFFT_FFTW -I${FFTW_INCLUDE}
-#FFT_PATH = -L${FFTW_LIB}
-#FFT_LIB = -lfftw
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.serial b/src/MAKE/MACHINES/Makefile.serial
deleted file mode 100755
index bff42d9530..0000000000
--- a/src/MAKE/MACHINES/Makefile.serial
+++ /dev/null
@@ -1,115 +0,0 @@
-# serial = RedHat Linux box, g++4, no MPI, no FFTs
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = g++
-CCFLAGS = -O
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = g++
-LINKFLAGS = -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -I../STUBS
-MPI_PATH = -L../STUBS
-MPI_LIB = -lmpi_stubs
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.stampede b/src/MAKE/MACHINES/Makefile.stampede
deleted file mode 100755
index 3edda8c9f7..0000000000
--- a/src/MAKE/MACHINES/Makefile.stampede
+++ /dev/null
@@ -1,114 +0,0 @@
-# stampede = Intel Compiler, MKL FFT, Offload to Xeon Phi
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpicc -openmp -DLMP_INTEL_OFFLOAD -DLAMMPS_MEMALIGN=64
-MIC_OPT = -offload-option,mic,compiler,"-fp-model fast=2 -mGLOB_default_function_attrs=\"gather_scatter_loop_unroll=4\""
-CCFLAGS = -O3 -xhost -fp-model precise -restrict -override-limits $(MIC_OPT)
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpicc -openmp
-LINKFLAGS = -O3 -xhost
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_MKL -I$(TACC_MKL_INC)
-FFT_PATH =
-FFT_LIB = -L$(TACC_MKL_LIB) -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB = -ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.storm b/src/MAKE/MACHINES/Makefile.storm
deleted file mode 100644
index cb41e3ada1..0000000000
--- a/src/MAKE/MACHINES/Makefile.storm
+++ /dev/null
@@ -1,116 +0,0 @@
-# storm = Cray Red Storm XT3, Cray CC, native MPI, FFTW
-
-SHELL = /bin/sh
-.SUFFIXES: .cpp .d
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = CC
-CCFLAGS = -fastsse
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = CC
-LINKFLAGS = -O
-LIB = -lstdc++
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_FFTW -I/projects/fftw/fftw-2.1.5/include
-FFT_PATH =
-FFT_LIB = -lfftw
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.tacc b/src/MAKE/MACHINES/Makefile.tacc
deleted file mode 100644
index 4f2e9bd054..0000000000
--- a/src/MAKE/MACHINES/Makefile.tacc
+++ /dev/null
@@ -1,118 +0,0 @@
-# tacc = UT Lonestar TACC machine, mpiCC, MPI, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpiCC
-CCFLAGS = -O
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpiCC
-LINKFLAGS = -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX
-MPI_PATH =
-MPI_LIB = -lmpich -lpthread
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFTW_INC = ${TACC_FFTW2_INC}
-FFTW_LIB = ${TACC_FFTW2_LIB}
-
-FFT_INC = -DFFT_FFTW -I${FFTW_INC}
-FFT_PATH = -L${FFTW_LIB}
-FFT_LIB = ${FFTW_LIB}/libfftw.a
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.ubuntu b/src/MAKE/MACHINES/Makefile.ubuntu
deleted file mode 100644
index df4e603341..0000000000
--- a/src/MAKE/MACHINES/Makefile.ubuntu
+++ /dev/null
@@ -1,119 +0,0 @@
-# ubuntu = Ubuntu Linux box, g++, openmpi, FFTW3
-
-# you have to install the packages g++, mpi-default-bin, mpi-default-dev,
-# libfftw3-dev, libjpeg-dev and libpng12-dev to compile LAMMPS with this
-# makefile
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpic++
-CCFLAGS = -g -O3 # -Wunused
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpic++
-LINKFLAGS = -g -O3
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP -DLAMMPS_JPEG -DLAMMPS_PNG -DLAMMPS_FFMPEG
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_FFTW3
-FFT_PATH =
-FFT_LIB = -lfftw3
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB = -ljpeg -lpng
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.ubuntu_simple b/src/MAKE/MACHINES/Makefile.ubuntu_simple
deleted file mode 100644
index e4e45eae08..0000000000
--- a/src/MAKE/MACHINES/Makefile.ubuntu_simple
+++ /dev/null
@@ -1,118 +0,0 @@
-# ubuntu_simple = Ubuntu Linux box, g++, openmpi, KISS FFT
-
-# you have to install the packages g++, mpi-default-bin and mpi-default-dev
-# to compile LAMMPS with this makefile
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpic++
-CCFLAGS = -g -O3 # -Wunused
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpic++
-LINKFLAGS = -g -O3
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.xe6 b/src/MAKE/MACHINES/Makefile.xe6
deleted file mode 100644
index bb68d75dba..0000000000
--- a/src/MAKE/MACHINES/Makefile.xe6
+++ /dev/null
@@ -1,116 +0,0 @@
-# xe6 = Cray XE6, Cray CC, native MPI, FFTW
-
-SHELL = /bin/sh
-.SUFFIXES: .cpp .d
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = CC
-CCFLAGS = -fastsse
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = CC
-LINKFLAGS = -O
-LIB = -lstdc++
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_FFTW
-FFT_PATH =
-FFT_LIB = -lfftw
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.xt3 b/src/MAKE/MACHINES/Makefile.xt3
deleted file mode 100644
index 274a523695..0000000000
--- a/src/MAKE/MACHINES/Makefile.xt3
+++ /dev/null
@@ -1,117 +0,0 @@
-# xt3 = PSC BigBen Cray XT3, CC, native MPI, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = CC
-CCFLAGS = -O3 --target=catamount \
- -fomit-frame-pointer -finline-functions \
- -Wall -Wno-unused -funroll-all-loops
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = CC
-LINKFLAGS = --target=catamount -O
-LIB = -lgmalloc
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP -DLAMMPS_XDR
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX
-MPI_PATH =
-MPI_LIB = -lmpich -lpthread
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_FFTW -I$(FFTW_INC)
-FFT_PATH = -L$(FFTW_LIB)
-FFT_LIB = -ldfftw
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.xt5 b/src/MAKE/MACHINES/Makefile.xt5
deleted file mode 100644
index 920b5e5bd5..0000000000
--- a/src/MAKE/MACHINES/Makefile.xt5
+++ /dev/null
@@ -1,116 +0,0 @@
-# xt5 = Cray XT5, Cray CC, native MPI, FFTW
-
-SHELL = /bin/sh
-.SUFFIXES: .cpp .d
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = CC
-CCFLAGS = -fastsse
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = CC
-LINKFLAGS = -O
-LIB = -lstdc++
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_FFTW -I/home/sjplimp/fftw/fftw
-FFT_PATH = -L/home/sjplimp/fftw/fftw/.libs
-FFT_LIB = -lfftw
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/Makefile.mpi b/src/MAKE/Makefile.mpi
deleted file mode 100755
index c88985f336..0000000000
--- a/src/MAKE/Makefile.mpi
+++ /dev/null
@@ -1,115 +0,0 @@
-# mpi = default MPI compiler, default MPI
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpicxx
-CCFLAGS = -g -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpicxx
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manual
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/Makefile.serial b/src/MAKE/Makefile.serial
deleted file mode 100755
index 2833839eef..0000000000
--- a/src/MAKE/Makefile.serial
+++ /dev/null
@@ -1,115 +0,0 @@
-# serial = g++ compiler, no MPI, internal FFT
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = g++
-CCFLAGS = -g -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = g++
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -I../STUBS
-MPI_PATH = -L../STUBS
-MPI_LIB = -lmpi_stubs
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.fftw b/src/MAKE/OPTIONS/Makefile.fftw
deleted file mode 100755
index 966f823a59..0000000000
--- a/src/MAKE/OPTIONS/Makefile.fftw
+++ /dev/null
@@ -1,115 +0,0 @@
-# fftw = default MPI compiler, default MPI, FFTW support
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpicxx
-CCFLAGS = -g -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpicxx
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manual
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_FFTW3 -I/usr/local/include
-FFT_PATH = -L/usr/local/lib
-FFT_LIB = -lfftw3
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.intel_cpu b/src/MAKE/OPTIONS/Makefile.intel_cpu
deleted file mode 100755
index f1c420f7ce..0000000000
--- a/src/MAKE/OPTIONS/Makefile.intel_cpu
+++ /dev/null
@@ -1,118 +0,0 @@
-# intel_cpu = USER-INTEL package with CPU optimizations, Intel MPI, MKL FFT
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpiicpc
-OPTFLAGS = -xHost -O2 -fp-model fast=2 -no-prec-div -override-limits
-CCFLAGS = -g -openmp -DLAMMPS_MEMALIGN=64 -no-offload \
- -fno-alias -ansi-alias -restrict $(OPTFLAGS)
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpiicpc
-LINKFLAGS = -g -openmp $(OPTFLAGS)
-LIB = -ltbbmalloc
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP -DLAMMPS_JPEG
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_MKL -DFFT_SINGLE
-FFT_PATH =
-FFT_LIB = -L$MKLROOT/lib/intel64/ -lmkl_intel_ilp64 \
- -lmkl_intel_thread -lmkl_core
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB = -ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.intel_knl b/src/MAKE/OPTIONS/Makefile.intel_knl
deleted file mode 100755
index 353826d48c..0000000000
--- a/src/MAKE/OPTIONS/Makefile.intel_knl
+++ /dev/null
@@ -1,115 +0,0 @@
-# intel_knl = USER-INTEL package build for "Knights Landing" processors, Intel MPI, MKL FFT
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpiicpc
-CCFLAGS = -g -O2 -openmp -DLAMMPS_MEMALIGN=64 -no-offload -fp-model fast=2 \
- -xMIC-AVX512 -fno-alias -ansi-alias -restrict -override-limits
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpiicpc
-LINKFLAGS = -g -O2 -openmp -xMIC-AVX512
-LIB = -ltbbmalloc
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP -DLAMMPS_JPEG
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_MKL -DFFT_SINGLE
-FFT_PATH =
-FFT_LIB = -L$MKLROOT/lib/intel64/ -lmkl_intel_ilp64 \
- -lmkl_intel_thread -lmkl_core
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB = -ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.intel_phi b/src/MAKE/OPTIONS/Makefile.intel_phi
deleted file mode 100755
index ad9b0d35aa..0000000000
--- a/src/MAKE/OPTIONS/Makefile.intel_phi
+++ /dev/null
@@ -1,118 +0,0 @@
-# intel_phi = USER-INTEL package with Phi offload support, Intel MPI, MKL FFT
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpiicpc
-MIC_OPT = -offload-option,mic,compiler,"-fp-model fast=2 -mGLOB_default_function_attrs=\"gather_scatter_loop_unroll=4\""
-CCFLAGS = -g -O3 -openmp -DLMP_INTEL_OFFLOAD -DLAMMPS_MEMALIGN=64 \
- -xHost -fno-alias -ansi-alias -restrict \
- -override-limits $(MIC_OPT)
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpiicpc
-LINKFLAGS = -g -O3 -xHost -openmp -offload
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP -DLAMMPS_JPEG
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_MKL -DFFT_SINGLE
-FFT_PATH =
-FFT_LIB = -L$(MKLROOT)/lib/intel64/ -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB = -ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.jpeg b/src/MAKE/OPTIONS/Makefile.jpeg
deleted file mode 100755
index 8cc5e86a68..0000000000
--- a/src/MAKE/OPTIONS/Makefile.jpeg
+++ /dev/null
@@ -1,115 +0,0 @@
-# jpeg = default MPI compiler, default MPI, JPEG support
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpicxx
-CCFLAGS = -g -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpicxx
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP -DLAMMPS_JPEG
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manual
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC = -I/usr/include
-JPG_PATH = -L/usr/lib
-JPG_LIB = -ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.knl b/src/MAKE/OPTIONS/Makefile.knl
deleted file mode 100755
index 68e68fe19e..0000000000
--- a/src/MAKE/OPTIONS/Makefile.knl
+++ /dev/null
@@ -1,116 +0,0 @@
-# knl = Flags for Knights Landing Xeon Phi Processor,Intel Compiler/MPI,MKL FFT
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpiicpc
-OPTFLAGS = -xMIC-AVX512 -O2 -fp-model fast=2 -no-prec-div -override-limits
-CCFLAGS = -g -openmp -DLAMMPS_MEMALIGN=64 -no-offload \
- -fno-alias -ansi-alias -restrict $(OPTFLAGS)
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpiicpc
-LINKFLAGS = -g -openmp $(OPTFLAGS) -static-intel
-LIB = -ltbbmalloc
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP -DLAMMPS_JPEG
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_MKL -DFFT_SINGLE
-FFT_PATH =
-FFT_LIB = -L$MKLROOT/lib/intel64/ -lmkl_intel_ilp64 \
- -lmkl_intel_thread -lmkl_core
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB = -ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.kokkos_cuda b/src/MAKE/OPTIONS/Makefile.kokkos_cuda
deleted file mode 100755
index af557992e0..0000000000
--- a/src/MAKE/OPTIONS/Makefile.kokkos_cuda
+++ /dev/null
@@ -1,120 +0,0 @@
-# kokkos_cuda = KOKKOS package with CUDA support, OpenMPI, nvcc/mpicxx compiler
-
-SHELL = /bin/sh
-
-KOKKOS_ABSOLUTE_PATH = $(shell cd $(KOKKOS_PATH); pwd)
-export OMPI_CXX = $(KOKKOS_ABSOLUTE_PATH)/config/nvcc_wrapper
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpicxx
-CCFLAGS = -g -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpicxx
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-KOKKOS_DEVICES = Cuda, OpenMP
-KOKKOS_ARCH = Kepler35
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.kokkos_omp b/src/MAKE/OPTIONS/Makefile.kokkos_omp
deleted file mode 100644
index 90fc7baa58..0000000000
--- a/src/MAKE/OPTIONS/Makefile.kokkos_omp
+++ /dev/null
@@ -1,116 +0,0 @@
-# kokkos_omp = KOKKOS package with OMP support, MPI compiler, default MPI
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpicxx
-CCFLAGS = -g -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpicxx
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-KOKKOS_DEVICES = OpenMP
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manual
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.kokkos_phi b/src/MAKE/OPTIONS/Makefile.kokkos_phi
deleted file mode 100644
index f1aa550617..0000000000
--- a/src/MAKE/OPTIONS/Makefile.kokkos_phi
+++ /dev/null
@@ -1,117 +0,0 @@
-# kokkos_phi = KOKKOS package with PHI support, Intel compiler, default MPI
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpiicpc
-CCFLAGS = -g -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpiicpc
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-KOKKOS_DEVICES = OpenMP
-KOKKOS_ARCH = KNC
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manual
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.mpi_fastmgpt b/src/MAKE/OPTIONS/Makefile.mpi_fastmgpt
deleted file mode 100644
index 521c98933c..0000000000
--- a/src/MAKE/OPTIONS/Makefile.mpi_fastmgpt
+++ /dev/null
@@ -1,113 +0,0 @@
-# mpi_fastmgpt = default MPI compiler, default MPI, optimizations for USER-MGPT
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpicxx
-CCFLAGS = -O3 -msse3 -funroll-loops
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpicxx
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manual
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.mpich_g++ b/src/MAKE/OPTIONS/Makefile.mpich_g++
deleted file mode 100755
index 0be96f9255..0000000000
--- a/src/MAKE/OPTIONS/Makefile.mpich_g++
+++ /dev/null
@@ -1,115 +0,0 @@
-# mpich_g++ = g++ compiler and MPICH via MPI wrapper
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpicxx -cxx=g++
-CCFLAGS = -g -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpicxx -cxx=g++
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.mpich_icc b/src/MAKE/OPTIONS/Makefile.mpich_icc
deleted file mode 100755
index a56f5b7a25..0000000000
--- a/src/MAKE/OPTIONS/Makefile.mpich_icc
+++ /dev/null
@@ -1,115 +0,0 @@
-# mpich_icc = icc compiler and MPICH via MPI wrapper
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpicxx -cxx=icc
-CCFLAGS = -g -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpicxx -cxx=icc
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.mpich_native_g++ b/src/MAKE/OPTIONS/Makefile.mpich_native_g++
deleted file mode 100755
index 90e738fe60..0000000000
--- a/src/MAKE/OPTIONS/Makefile.mpich_native_g++
+++ /dev/null
@@ -1,115 +0,0 @@
-# mpich_native_g++ = g++ compiler, native MPICH w/out wrapper
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = g++
-CCFLAGS = -g -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = g++
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1 -I/usr/local/include
-MPI_PATH = -L/usr/local/lib
-MPI_LIB = -lmpich -lmpl -lpthread
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.mpich_native_icc b/src/MAKE/OPTIONS/Makefile.mpich_native_icc
deleted file mode 100755
index 6f3f266468..0000000000
--- a/src/MAKE/OPTIONS/Makefile.mpich_native_icc
+++ /dev/null
@@ -1,115 +0,0 @@
-# mpich_native_icc = icc compiler, native MPICH w/out wrapper
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = icc
-CCFLAGS = -g -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = icc
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1 -I/usr/local/include
-MPI_PATH = -L/usr/local/lib
-MPI_LIB = -lmpich -lmpl -lpthread
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.omp b/src/MAKE/OPTIONS/Makefile.omp
deleted file mode 100755
index 56310f284c..0000000000
--- a/src/MAKE/OPTIONS/Makefile.omp
+++ /dev/null
@@ -1,115 +0,0 @@
-# omp = USER-OMP package with default MPI compiler, default MPI
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpicxx
-CCFLAGS = -g -O3 -restrict -fopenmp
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpicxx
-LINKFLAGS = -g -O -fopenmp
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manual
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.ompi_g++ b/src/MAKE/OPTIONS/Makefile.ompi_g++
deleted file mode 100755
index 1b447689f5..0000000000
--- a/src/MAKE/OPTIONS/Makefile.ompi_g++
+++ /dev/null
@@ -1,116 +0,0 @@
-# ompi_g++ = g++ compiler and OpenMPI via MPI wrapper
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-OMPI_CXX := g++
-CC = mpicxx
-CCFLAGS = -g -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpicxx
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.ompi_icc b/src/MAKE/OPTIONS/Makefile.ompi_icc
deleted file mode 100755
index a5db57c953..0000000000
--- a/src/MAKE/OPTIONS/Makefile.ompi_icc
+++ /dev/null
@@ -1,116 +0,0 @@
-# ompi_icc = icc compiler and OpenMPI via MPI wrapper
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-OMPI_CXX := icc
-CC = mpicxx
-CCFLAGS = -g -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpicxx
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.ompi_native_g++ b/src/MAKE/OPTIONS/Makefile.ompi_native_g++
deleted file mode 100755
index 01c4c2fac2..0000000000
--- a/src/MAKE/OPTIONS/Makefile.ompi_native_g++
+++ /dev/null
@@ -1,115 +0,0 @@
-# ompi_native_g++ = g++ compiler, native OpenMPI w/out wrapper
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = g++
-CCFLAGS = -g -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = g++
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1 -I/usr/local/include
-MPI_PATH = -L/usr/local/lib
-MPI_LIB = -lmpi -lmpi_cxx
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.ompi_native_icc b/src/MAKE/OPTIONS/Makefile.ompi_native_icc
deleted file mode 100755
index 89e7df2225..0000000000
--- a/src/MAKE/OPTIONS/Makefile.ompi_native_icc
+++ /dev/null
@@ -1,115 +0,0 @@
-# ompi_native_icc = icc compiler, native OpenMPI w/out wrapper
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = icc
-CCFLAGS = -g -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = icc
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1 -I/usr/local/include
-MPI_PATH = -L/usr/local/lib
-MPI_LIB = -lmpi -lmpi_cxx
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.opt b/src/MAKE/OPTIONS/Makefile.opt
deleted file mode 100755
index c1875b534f..0000000000
--- a/src/MAKE/OPTIONS/Makefile.opt
+++ /dev/null
@@ -1,115 +0,0 @@
-# opt = OPT package with default MPI compiler, default MPI
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpicxx
-CCFLAGS = -g -O3 -restrict
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpicxx
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manual
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.pgi b/src/MAKE/OPTIONS/Makefile.pgi
deleted file mode 100644
index 89faf682a8..0000000000
--- a/src/MAKE/OPTIONS/Makefile.pgi
+++ /dev/null
@@ -1,116 +0,0 @@
-# pgi = Portland Group compiler pgCC, MPICH, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = pgCC
-CCFLAGS = -g -fast
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = pgCC
-LINKFLAGS = -g
-LIB =
-#LIB = -lstdc++
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -I/usr/local/mpich-1.2.6/pg/include
-MPI_PATH = -L/usr/local/mpich-1.2.6/pg/lib
-MPI_LIB = -lmpich
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC = -DFFT_FFTW3
-FFT_PATH =
-FFT_LIB = -lfftw3
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.png b/src/MAKE/OPTIONS/Makefile.png
deleted file mode 100755
index 26e25583df..0000000000
--- a/src/MAKE/OPTIONS/Makefile.png
+++ /dev/null
@@ -1,115 +0,0 @@
-# png = default MPI compiler, default MPI, PNG support
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = mpicxx
-CCFLAGS = -g -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = mpicxx
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP -DLAMMPS_PNG
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
-MPI_PATH =
-MPI_LIB =
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manual
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC = -I/usr/include
-JPG_PATH = -L/usr/lib
-JPG_LIB = -lpng
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/OPTIONS/Makefile.serial_icc b/src/MAKE/OPTIONS/Makefile.serial_icc
deleted file mode 100755
index ddc9a2c147..0000000000
--- a/src/MAKE/OPTIONS/Makefile.serial_icc
+++ /dev/null
@@ -1,115 +0,0 @@
-# serial_icc = icc compiler, no MPI
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC = icc
-CCFLAGS = -g -O3
-SHFLAGS = -fPIC
-DEPFLAGS = -M
-
-LINK = icc
-LINKFLAGS = -g -O
-LIB =
-SIZE = size
-
-ARCHIVE = ar
-ARFLAGS = -rc
-SHLIBFLAGS = -shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC = -I../STUBS
-MPI_PATH = -L../STUBS
-MPI_LIB = -lmpi_stubs
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH =
-FFT_LIB =
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =
-JPG_PATH =
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-EXTRA_CPP_DEPENDS = $(PKG_CPP_DEPENDS)
-EXTRA_LINK_DEPENDS = $(PKG_LINK_DEPENDS)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
- $(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ) $(EXTRA_LINK_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
- $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu $(EXTRA_CPP_DEPENDS)
- $(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/README b/src/MAKE/README
deleted file mode 100644
index eddac49358..0000000000
--- a/src/MAKE/README
+++ /dev/null
@@ -1,106 +0,0 @@
-This directory and its sub-directories contain machine Makefiles for
-LAMMPS. The use of machine Makefiles and their settings are discussed
-in Section 2 of the manual.
-
-If you are new to LAMMPS, try one of the files in this directory
-first.
-
-Then you can try files in the sub-directories with more options you
-may need, or that are specific to a machine you are running on.
-
-If none of the existing files work, you can edit a file in either
-directory to create your own customized Makefile.machine. Put it in
-the MINE directory if you want to avoid conflicts with the Makefiles
-distributed with LAMMPS.
-
------------------------------------
-
-This directory has two generic Makefiles which should work as-is on
-many platforms.
-
-Makefile.mpi assumes MPI is installed on your machine
-Makefile.serial build without MPI for serial execution (single core)
-
-Makefile.mpi builds with the mpicxx wrapper provided with all MPI
-installations. It uses a default compiler (the one MPI was built
-with) and should work with whatever version of MPI is installed
-(OpenMPI, MPICH, vendor, etc).
-
-Makefile.serial builds without MPI, using the GNU g++ compiler. It
-uses the dummy MPI library in src/STUBS, which you can pre-build via
-"make stubs" in the src dir. See Makefile.serial_icc in the OPTIONS
-dir for the same thing using the Intel icc compiler instead of g++.
-
------------------------------------
-
-The OPTIONS directory has several Makefiles that extend either
-Makefile.mpi or Makefile.serial to enable use of different compilers,
-different MPIs, or accelerator package and command options that LAMMPS
-supports.
-
---------
-
-Makefile.fftw FFTW support for long-range Coulombics (PPPM)
-Makefile.jpeg JPEG support for dump image
-Makefile.png PNG support for dump image
-
-These Makefiles are the same as Makefile.mpi except they add settings
-for commonly used options (FFTW, JPG, PNG) to illustrate how they can
-be added to any Makefile.
-
---------
-
-Makefile.kokkos_omp KOKKOS package with CUDA support via nvcc compiler
-Makefile.kokkos_cuda KOKKOS package with CUDA support via nvcc compiler
-Makefile.kokkos_phi KOKKOS package with CUDA support via nvcc compiler
-
-These Makefiles are for building with the KOKKOS package for different
-architectures (multi-core with OpenMP threading, GPU, Xeon Phi). Some
-Makefile variables are set and appended to.
-
---------
-
-Makefile.intel_cpu USER-INTEL package with CPU acceleration
-Makefile.intel_phi USER-INTEL package with Xeon Phi support
-
-These Makefiles are for building with the USER-INTEL package with
-either CPU or Xeon Phi (offload) support. Some Makefile variables are
-set and appended to.
-
---------
-
-Makefile.mpich_g++ compile with MPICH wrapper, set compiler to GNU g++
-Makefile.mpich_icc compile with MPICH wrapper, set compiler to Intel icc
-Makefile.ompi_g++ compile with OpenMPI wrapper, set compiler to GNU g++
-Makefile.ompi_icc compile with OpenMPI wrapper, set compiler to Intel icc
-
-Makefile.serial_icc serial build with Intel icc compiler
-Makefile.pgi MPI guild with the PGI compiler
-
-These Makefiles adapt Makefile.mpi and Makefile.serial to use specific
-compilers.
-
---------
-
-Makefile.mpich_native_g++ compile with GNU g++, link to MPICH
-Makefile.mpich_native_icc compile with Intel icc, link to MPICH
-Makefile.ompi_native_g++ compile with GNU g++, link to OpenMPI
-Makefile.ompi_native_icc compile with Intel icc, link to OpenMPI
-
-These Makefiles show how to build with MPI support, but not using the
-MPI wrapper "mpicxx" for compiling. Instead, g++ or icc is used
-directly to compile and the MPI library is linked to. This requires
-extra settings for the MPI variables to specify the MPI include and
-library files.
-
-------------------------------------
-
-The MACHINE sub-directory has many Makefiles, each of which has been
-setup for a specific kind of machine or a specific supercomputer.
-
-Examples include:
-
-Makefile.mac Apple Macintosh
-Makefile.xe6 Cray XE6
-Makefile.bgq IBM BG/Q
-Makefile.stampede U Texas "stampede" machine
diff --git a/src/Make.py b/src/Make.py
index c30255f9d1..d8be53f13b 100755
--- a/src/Make.py
+++ b/src/Make.py
@@ -19,8 +19,8 @@ abbrevs = "adhjmoprsv"
switchclasses = ("actions","dir","help","jmake","makefile",
"output","packages","redo","settings","verbose")
-libclasses = ("atc","awpmd","colvars","cuda","gpu",
- "meam","poems","qmmm","reax","voronoi")
+libclasses = ("atc","awpmd","colvars","cuda","gpu","h5md",
+ "meam","poems","python","qmmm","reax","voronoi")
buildclasses = ("intel","kokkos")
makeclasses = ("cc","mpi","fft","jpg","png")
@@ -577,8 +577,8 @@ Syntax: Make.py switch args ...
-d (dir), -j (jmake), -m (makefile), -o (output),
-p (packages), -r (redo), -s (settings), -v (verbose)
switches for libs:
- -atc, -awpmd, -colvars, -cuda
- -gpu, -meam, -poems, -qmmm, -reax, -voronoi
+ -atc, -awpmd, -colvars, -cuda, -gpu, -h5md,
+ -meam, -poems, -python, -qmmm, -reax, -voronoi
switches for build and makefile options:
-intel, -kokkos, -cc, -mpi, -fft, -jpg, -png
"""
@@ -652,7 +652,7 @@ class Packages:
list of packages to install or uninstall in order specified
operates on set of packages currently installed
valid package names:
- and LAMMPS standard or user package (type "make package" to see list)
+ any LAMMPS standard or user package (type "make package" to see list)
prefix by yes/no to install/uninstall (see abbrevs)
yes-molecule, yes-user-atc, no-molecule, no-user-atc
can use LAMMPS categories (type "make package" to see list)
@@ -1212,6 +1212,56 @@ class GPU:
error("Unsuccessful build of lib/gpu library")
else: print "Created lib/gpu library"
+# H5MD lib
+
+class H5MD:
+ def __init__(self,list):
+ self.inlist = copy.copy(list)
+ self.make = "h5cc"
+ self.lammpsflag = 0
+
+ def help(self):
+ return """
+-h5md make=suffix lammps=suffix2
+ all args are optional and can be in any order
+ make = use Makefile.suffix (def = h5cc)
+ lammps = use Makefile.lammps.suffix2 (def = EXTRAMAKE in makefile)
+"""
+
+ def check(self):
+ if self.inlist != None and len(self.inlist) == 0:
+ error("-h5md args are invalid")
+ for one in self.inlist:
+ words = one.split('=')
+ if len(words) != 2: error("-h5md args are invalid")
+ if words[0] == "make": self.make = words[1]
+ elif words[0] == "lammps":
+ self.lammps = words[1]
+ self.lammpsflag = 1
+ else: error("-h5md args are invalid")
+
+ def build(self):
+ libdir = dir.lib + "/h5md"
+ make = MakeReader("%s/Makefile.%s" % (libdir,self.make))
+ if self.lammpsflag:
+ make.setvar("EXTRAMAKE","Makefile.lammps.%s" % self.lammps)
+ make.write("%s/Makefile.auto" % libdir)
+
+ commands.getoutput("cd %s; make clean" % libdir)
+ str = "cd %s; make" % libdir
+
+ # if verbose, print output as build proceeds, else only print if fails
+
+ if verbose: subprocess.call(str,shell=True)
+ else:
+ try: subprocess.check_output(str,stderr=subprocess.STDOUT,shell=True)
+ except Exception as e: print e.output
+
+ if not os.path.isfile("%s/libch5md.a" % libdir) or \
+ not os.path.isfile("%s/Makefile.lammps" % libdir):
+ error("Unsuccessful build of lib/h5md library")
+ else: print "Created lib/h5md library"
+
# MEAM lib
class MEAM:
@@ -1314,6 +1364,41 @@ class POEMS:
error("Unsuccessful build of lib/poems library")
else: print "Created lib/poems library"
+# PYTHON lib
+
+class PYTHON:
+ def __init__(self,list):
+ self.inlist = copy.copy(list)
+ self.make = "g++"
+ self.lammpsflag = 0
+
+ def help(self):
+ return """
+-python lammps=suffix
+ arg is optional, use Makefile.lammps if not specified
+ lammps = use Makefile.lammps.suffix
+"""
+
+ def check(self):
+ if self.inlist != None and len(self.inlist) == 0:
+ error("-python args are invalid")
+ for one in self.inlist:
+ words = one.split('=')
+ if len(words) != 2: error("-python args are invalid")
+ if words[0] == "lammps":
+ self.lammps = words[1]
+ self.lammpsflag = 1
+ else: error("-python args are invalid")
+
+ def build(self):
+ libdir = dir.lib + "/python"
+ if self.lammpsflag:
+ commands.getoutput("cd %s; cp Makefile.lammps.%s Makefile.lammps" %
+ (libdir,self.lammps))
+ if not os.path.isfile("%s/Makefile.lammps.%s" % (libdir,self.lammps)):
+ error("Unsuccessful creation of lib/python/Makefile.lammps.%s file" % self.lammps)
+ else: print "Created lib/python/Makefile.lammps file"
+
# QMMM lib
class QMMM:
diff --git a/src/Makefile b/src/Makefile
index 34838d7fd5..a0d9cc822d 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-# LAMMPS multiple-machine Makefile
+# LAMMPS multiple-machine -*- Makefile -*-
SHELL = /bin/bash
#.IGNORE:
@@ -146,6 +146,8 @@ help:
@if [ ! -e Makefile.package.settings ]; \
then cp Makefile.package.settings.empty Makefile.package.settings; fi
@cp Makefile.package Makefile.package.settings $(objdir)
+ @cd $(objdir); rm -f .depend; \
+ $(MAKE) $(MFLAGS) "SRC = $(SRC)" "INC = $(INC)" depend || :
ifeq ($(mode),exe)
@cd $(objdir); \
$(MAKE) $(MFLAGS) "OBJ = $(OBJ)" "INC = $(INC)" "SHFLAGS =" \
--
GitLab