lijiext
/
lammps
mirror of https://github.com/lammps/lammps.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

correct updating Makefile.package.setting edits, fix a few broken ones.

This commit is contained in:
Axel Kohlmeyer 2022-11-30 19:31:00 -05:00
parent e76e864152
commit 6fe8b84c23
No known key found for this signature in database
GPG Key ID: D9B44E93BF0C375A
29 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ADIOS/Install.sh
View File

@ -69,7 +69,7 @@ adios_SYSLIB=${ADIOS2_LIB}
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*ADIOS.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*ADIOS.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ../ADIOS/Makefile.lammps
@ -85,7 +85,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*ADIOS.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*ADIOS.*$/d' ../Makefile.package.settings
fi
rm -f Makefile.lammps

4
src/ATC/Install.sh
View File

@ -60,7 +60,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*atc.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*atc.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/atc\/Makefile.lammps
@ -74,7 +74,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*atc.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*atc.*$/d' ../Makefile.package.settings
fi
fi

4
src/AWPMD/Install.sh
View File

@ -46,7 +46,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*awpmd.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*awpmd.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/awpmd\/Makefile.lammps
@ -60,7 +60,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*awpmd.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*awpmd.*$/d' ../Makefile.package.settings
fi
fi

4
src/COLVARS/Install.sh
View File

@ -47,7 +47,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*colvars.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*colvars.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/colvars\/Makefile.lammps
@ -62,7 +62,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*colvars.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*colvars.*$/d' ../Makefile.package.settings
fi
fi

4
src/COMPRESS/Install.sh
View File

@ -44,7 +44,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*compress.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*compress.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/compress\/Makefile.lammps
@ -58,7 +58,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*compress.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*compress.*$/d' ../Makefile.package.settings
fi
fi

8
src/ELECTRODE/Install.sh
View File

@ -49,11 +49,11 @@ if (test $1 = 1) then
sed -i -e 's|^PKG_SYSLIB =[ \t]*|&$(electrode_SYSLIB) |' ../Makefile.package
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*electrode.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*electrode.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/electrode\/Makefile.lammps
' ../Makefile.package.settings
include ..\/..\/lib\/electrode\/Makefile.lammps
' ../Makefile.package.settings
fi
elif (test $1 = 0) then
@ -61,7 +61,7 @@ elif (test $1 = 0) then
sed -i -e 's/[^ \t]*electrode[^ \t]* //g' ../Makefile.package
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*electrode.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*electrode.*$/d' ../Makefile.package.settings
fi
fi

4
src/GPU/Install.sh
View File

@ -176,7 +176,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*gpu.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*gpu.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/gpu\/Makefile.lammps
@ -191,7 +191,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*gpu.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*gpu.*$/d' ../Makefile.package.settings
fi
fi

4
src/H5MD/Install.sh
View File

@ -45,7 +45,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*h5md.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*h5md.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/h5md\/Makefile.lammps
@ -60,7 +60,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*h5md.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*h5md.*$/d' ../Makefile.package.settings
fi
fi

4
src/KIM/Install.sh
View File

@ -44,7 +44,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*kim.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*kim.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/kim\/Makefile.lammps
@ -58,7 +58,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*kim.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*kim.*$/d' ../Makefile.package.settings
fi
fi

4
src/KOKKOS/Install.sh
View File

@ -374,7 +374,7 @@ if (test $1 = 1) then
if (test -e ../Makefile.package.settings) then
sed -i -e '/CXX\ =\ \$(CC)/d' ../Makefile.package.settings
sed -i -e '/^include.*kokkos.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*kokkos.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
CXX = $(CC)
@ -401,7 +401,7 @@ elif (test $1 = 0) then
if (test -e ../Makefile.package.settings) then
sed -i -e '/CXX\ =\ \$(CC)/d' ../Makefile.package.settings
sed -i -e '/^include.*kokkos.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*kokkos.*$/d' ../Makefile.package.settings
fi
fi

4
src/LATTE/Install.sh
View File

@ -47,7 +47,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*latte.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*latte.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/latte\/Makefile.lammps
@ -61,7 +61,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*latte.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*latte.*$/d' ../Makefile.package.settings
fi
fi

4
src/MACHDYN/Install.sh
View File

@ -45,7 +45,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*machdyn.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*machdyn.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/machdyn\/Makefile.lammps
@ -59,7 +59,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*machdyn.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*machdyn.*$/d' ../Makefile.package.settings
fi
fi

4
src/MDI/Install.sh
View File

@ -49,7 +49,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*mdi.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*mdi.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/mdi\/Makefile.lammps
@ -65,7 +65,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*mdi.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*mdi.*$/d' ../Makefile.package.settings
fi
fi

4
src/MESONT/Install.sh
View File

@ -47,7 +47,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*mesont.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*mesont.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/mesont\/Makefile.lammps
@ -61,7 +61,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*mesont.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*mesont.*$/d' ../Makefile.package.settings
fi
fi

4
src/ML-HDNNP/Install.sh
View File

@ -46,7 +46,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*hdnnp.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*hdnnp.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/hdnnp\/Makefile.lammps
@ -60,7 +60,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*hdnnp.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*hdnnp.*$/d' ../Makefile.package.settings
fi
fi

8
src/ML-IAP/Install.sh
View File

@ -52,7 +52,7 @@ if (test $1 = 1) then
sed -i -e 's|^PKG_INC =[ \t]*|&-DMLIAP_PYTHON |' ../Makefile.package
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*python.*mliap_python.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*python.*mliap_python.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/python\/Makefile.mliap_python
@ -68,7 +68,7 @@ elif (test $1 = 0) then
fi
rm -f ../mliap_model_python_couple.cpp ../mliap_model_python_couple.h \
../mliap_unified_couple.cpp ../mliap_unified_couple.h
sed -i -e '/^include.*python.*mliap_python.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*python.*mliap_python.*$/d' ../Makefile.package.settings
elif (test $1 = 2) then
if (type cythonize > /dev/null 2>&1 && test -e ../python_impl.cpp) then
@ -77,12 +77,12 @@ elif (test $1 = 2) then
fi
rm -f ../mliap_model_python_couple.cpp ../mliap_model_python_couple.h \
../mliap_unified_couple.cpp ../mliap_unified_couple.h
sed -i -e '/^include.*python.*mliap_python.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*python.*mliap_python.*$/d' ../Makefile.package.settings
if (test -e ../Makefile.package) then
sed -i -e 's|^PKG_INC =[ \t]*|&-DMLIAP_PYTHON |' ../Makefile.package
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*python.*mliap_python.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*python.*mliap_python.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/python\/Makefile.mliap_python

4
src/ML-PACE/Install.sh
View File

@ -44,7 +44,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*pace.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*pace.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/pace\/Makefile.lammps
@ -58,7 +58,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*pace.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*pace.*$/d' ../Makefile.package.settings
fi
fi

4
src/ML-QUIP/Install.sh
View File

@ -44,7 +44,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*quip.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*quip.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/quip\/Makefile.lammps\
@ -58,7 +58,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*quip.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*quip.*$/d' ../Makefile.package.settings
fi
fi

4
src/MOLFILE/Install.sh
View File

@ -44,7 +44,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*molfile.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*molfile.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/molfile\/Makefile.lammps
@ -58,7 +58,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*molfile.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*molfile.*$/d' ../Makefile.package.settings
fi
fi

4
src/MSCG/Install.sh
View File

@ -43,7 +43,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*mscg.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*mscg.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/mscg\/Makefile.lammps
@ -57,7 +57,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*mscg.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*mscg.*$/d' ../Makefile.package.settings
fi
fi

2
src/Makefile
View File

@ -55,7 +55,7 @@ PACKAGE = \
awpmd \
bocs \
body \
bpm \
bpm \
brownian \
cg-dna \
cg-spica \

4
src/NETCDF/Install.sh
View File

@ -42,7 +42,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*netcdf.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*netcdf.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/netcdf\/Makefile.lammps
@ -57,7 +57,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*netcdf.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*netcdf.*$/d' ../Makefile.package.settings
fi
fi

4
src/PLUGIN/Install.sh
View File

@ -44,7 +44,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*plugin.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*plugin.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/plugin\/Makefile.lammps
@ -58,7 +58,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*plugin.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*plugin.*$/d' ../Makefile.package.settings
fi
fi

4
src/PLUMED/Install.sh
View File

@ -45,7 +45,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*plumed.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*plumed.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/plumed\/Makefile.lammps
@ -59,7 +59,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*plumed.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*plumed.*$/d' ../Makefile.package.settings
fi
fi

4
src/POEMS/Install.sh
View File

@ -44,7 +44,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*poems.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*poems.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/poems\/Makefile.lammps
@ -58,7 +58,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*poems.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*poems.*$/d' ../Makefile.package.settings
fi
fi

4
src/PYTHON/Install.sh
View File

@ -50,7 +50,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*python.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*python.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/python\/Makefile.lammps
@ -65,7 +65,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*python.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*python.*$/d' ../Makefile.package.settings
fi
fi

4
src/QMMM/Install.sh
View File

@ -47,7 +47,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*qmmm.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*qmmm.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/qmmm\/Makefile.lammps
@ -62,7 +62,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*qmmm.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*qmmm.*$/d' ../Makefile.package.settings
fi
fi

4
src/VORONOI/Install.sh
View File

@ -48,7 +48,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*voronoi.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*voronoi.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/voronoi\/Makefile.lammps
@ -63,7 +63,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*voronoi.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*voronoi.*$/d' ../Makefile.package.settings
fi
fi

4
src/VTK/Install.sh
View File

@ -43,7 +43,7 @@ if (test $1 = 1) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*vtk.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*vtk.*$/d' ../Makefile.package.settings
# multiline form needed for BSD sed on Macs
sed -i -e '4 i \
include ..\/..\/lib\/vtk\/Makefile.lammps
@ -58,7 +58,7 @@ elif (test $1 = 0) then
fi
if (test -e ../Makefile.package.settings) then
sed -i -e '/^include.*vtk.*$/d' ../Makefile.package.settings
sed -i -e '/^[ \t]*include.*vtk.*$/d' ../Makefile.package.settings
fi
fi