diff --git a/src/Depend.sh b/src/Depend.sh index 84d642cb33..feb92c3e29 100644 --- a/src/Depend.sh +++ b/src/Depend.sh @@ -1,38 +1,49 @@ # Depend.sh = Install/unInstall files for dependent packages -# only Install/unInstall if dependent package is already installed -# all packages with dependencies should be listed here -# install dependent child files when parent files installed -# uninstall dependent child files when parent files uninstalled -# decisions on individual files are made by package Install.sh scripts +# all packages which contain one or more files that depend on +# other packages should be listed here, in both the 1 and 0 clauses +# this script is invoked after any parent package is installed/uninstalled +# this script re-installs child packages that depend on the parent, +# but only if the child package is already installed +# this is necessary to insure the child package installs +# only child files whose parent package files are now installed +# decisions on installing individual child files are made by +# the Install.sh script in the child package if (test $1 = 1) then - if (test -e pair_lj_cut_opt.h) then - cd OPT; /bin/sh Install.sh 1; cd .. - fi if (test -e pair_lj_cut_gpu.h) then cd GPU; /bin/sh Install.sh 1; cd .. fi + if (test -e pair_lj_cut_opt.h) then + cd OPT; /bin/sh Install.sh 1; cd .. + fi if (test -e cg_cmm_params.h) then cd USER-CG-CMM; /bin/sh Install.sh 1; cd .. fi if (test -e pair_lj_cut_cuda.h) then cd USER-CUDA; /bin/sh Install.sh 1; cd .. fi + if (test -e fix_imd.h) then + cd USER-MISC; /bin/sh Install.sh 1; cd .. + fi elif (test $1 = 0) then - if (test -e pair_lj_cut_opt.h) then - cd OPT; /bin/sh Install.sh 0; /bin/sh Install.sh 1; cd .. - fi if (test -e pair_lj_cut_gpu.h) then cd GPU; /bin/sh Install.sh 0; /bin/sh Install.sh 1; cd .. fi + if (test -e pair_lj_cut_opt.h) then + cd OPT; /bin/sh Install.sh 0; /bin/sh Install.sh 1; cd .. + fi if (test -e cg_cmm_params.h) then cd USER-CG-CMM; /bin/sh Install.sh 0; /bin/sh Install.sh 1; cd .. fi if (test -e pair_lj_cut_cuda.h) then cd USER-CUDA; /bin/sh Install.sh 0; /bin/sh Install.sh 1; cd .. fi + if (test -e fix_imd.h) then + cd USER-MISC; /bin/sh Install.sh 0; /bin/sh Install.sh 1; cd .. + fi fi + diff --git a/src/USER-MISC/Install.sh b/src/USER-MISC/Install.sh index aa2fc00f95..d8e5b17d9f 100644 --- a/src/USER-MISC/Install.sh +++ b/src/USER-MISC/Install.sh @@ -2,6 +2,11 @@ if (test $1 = 1) then + if (test -e ../pair_eam_alloy.cpp) then + cp pair_cdeam.cpp .. + cp pair_cdeam.h .. + fi + cp angle_cosine_shift.cpp .. cp angle_cosine_shift_exp.cpp .. cp angle_dipole.cpp .. @@ -16,7 +21,6 @@ if (test $1 = 1) then cp fix_smd.cpp .. cp improper_cossq.cpp .. cp improper_ring.cpp .. - cp pair_cdeam.cpp .. cp pair_coul_diel.cpp .. cp pair_dipole_sf.cpp .. cp pair_edip.cpp .. @@ -39,7 +43,6 @@ if (test $1 = 1) then cp fix_smd.h .. cp improper_cossq.h .. cp improper_ring.h .. - cp pair_cdeam.h .. cp pair_coul_diel.h .. cp pair_dipole_sf.h .. cp pair_edip.h ..