Small problem with makedep, make.depend updated

CPV/src/make.depend

@@ -423,12 +423,12 @@ exx_psi.o : ../../Modules/mp_wave.o
 exx_psi.o : ../../UtilXlib/mp.o
 exx_psi.o : ../../UtilXlib/parallel_include.o
 exx_vofr.o : ../../FFTXlib/fft_scalar.o
-exx_vofr.o : ../../XClib/xc_lib.o
 exx_vofr.o : ../../Modules/constants.o
 exx_vofr.o : ../../Modules/io_global.o
 exx_vofr.o : ../../Modules/kind.o
 exx_vofr.o : ../../Modules/mp_global.o
 exx_vofr.o : ../../UtilXlib/parallel_include.o
+exx_vofr.o : ../../XClib/xc_lib.o
 exx_vofr.o : exx_module.o
 exx_vofr.o : wannier_base.o
 forces.o : ../../FFTXlib/fft_helper_subroutines.o

PHonon/PH/make.depend

@@ -1217,6 +1217,7 @@ phescf.o : phcom.o
 phescf.o : ramanm.o
 phescf.o : write_hub.o
 phonon.o : ../../Modules/check_stop.o
+phonon.o : ../../Modules/control_flags.o
 phonon.o : ../../Modules/environment.o
 phonon.o : ../../Modules/mp_global.o
 phonon.o : ph_restart.o

PW/src/make.depend

@@ -228,7 +228,6 @@ buffers.o : ../../Modules/kind.o
 c_bands.o : ../../Modules/becmod.o
 c_bands.o : ../../Modules/check_stop.o
 c_bands.o : ../../Modules/control_flags.o
-c_bands.o : ../../Modules/funct.o
 c_bands.o : ../../Modules/io_files.o
 c_bands.o : ../../Modules/io_global.o
 c_bands.o : ../../Modules/kind.o
@@ -238,8 +237,8 @@ c_bands.o : ../../Modules/noncol.o
 c_bands.o : ../../Modules/recvec.o
 c_bands.o : ../../Modules/wavefunctions.o
 c_bands.o : ../../UtilXlib/mp.o
-c_bands.o : ../../upflib/uspp.o
 c_bands.o : ../../XClib/xc_lib.o
+c_bands.o : ../../upflib/uspp.o
 c_bands.o : atomic_wfc_mod.o
 c_bands.o : bp_mod.o
 c_bands.o : buffers.o

TDDFPT/src/make.depend

@@ -262,6 +262,7 @@ lr_dvpsi_eels.o : lr_variables.o
 lr_eels_main.o : ../../LR_Modules/lrcom.o
 lr_eels_main.o : ../../Modules/check_stop.o
 lr_eels_main.o : ../../Modules/constants.o
+lr_eels_main.o : ../../Modules/control_flags.o
 lr_eels_main.o : ../../Modules/environment.o
 lr_eels_main.o : ../../Modules/fft_base.o
 lr_eels_main.o : ../../Modules/io_files.o

XClib/make.depend

@@ -1,75 +1,61 @@
-xclib_error.o : xclib_para_m.o
-qe_constants.o : qe_kind.o
-xc_input_params_mod.o : qe_kind.o
 dft_mod.o : qe_kind.o
 dft_mod.o : xc_input_params_mod.o
-dft_mod.o : xclib_error.o
-qe_funct_exch_lda_lsda.o : qe_kind.o
-qe_funct_exch_lda_lsda.o : qe_constants.o
-qe_funct_corr_lda_lsda.o : qe_kind.o
-qe_funct_corr_gga.o : qe_kind.o
-qe_funct_corr_gga.o : qe_funct_corr_lda_lsda.o
-qe_funct_exch_gga.o : qe_kind.o
-qe_funct_exch_gga.o : qe_constants.o
-qe_funct_exch_gga.o : xclib_error.o
-qe_funct_mgga.o : qe_kind.o
-qe_funct_mgga.o : qe_constants.o
-qe_funct_mgga.o : qe_funct_exch_lda_lsda.o
-qe_funct_mgga.o : qe_funct_corr_lda_lsda.o
-qe_funct_mgga.o : qe_funct_corr_gga.o
-xc_beef_interface : qe_kind.o
-xc_beef_interface : xclib_error.o
-qe_drivers_lda_lsda.o : qe_kind.o
-qe_drivers_lda_lsda.o : xc_input_params_mod.o
-qe_drivers_lda_lsda.o : qe_funct_corr_lda_lsda.o
-qe_drivers_lda_lsda.o : qe_funct_exch_lda_lsda.o
-qe_drivers_d_lda_lsda.o : qe_kind.o
+qe_constants.o : qe_kind.o
+qe_drivers_d_gga.o : qe_drivers_gga.o
+qe_drivers_d_gga.o : qe_kind.o
+qe_drivers_d_gga.o : xc_input_params_mod.o
 qe_drivers_d_lda_lsda.o : qe_constants.o
-qe_drivers_d_lda_lsda.o : xc_input_params_mod.o
+qe_drivers_d_lda_lsda.o : qe_drivers_lda_lsda.o
 qe_drivers_d_lda_lsda.o : qe_funct_corr_lda_lsda.o
 qe_drivers_d_lda_lsda.o : qe_funct_exch_lda_lsda.o
-qe_drivers_d_lda_lsda.o : qe_drivers_lda_lsda.o
+qe_drivers_d_lda_lsda.o : qe_kind.o
+qe_drivers_d_lda_lsda.o : xc_input_params_mod.o
+qe_drivers_gga.o : qe_funct_corr_gga.o
+qe_drivers_gga.o : qe_funct_exch_gga.o
 qe_drivers_gga.o : qe_kind.o
 qe_drivers_gga.o : xc_beef_interface.o
 qe_drivers_gga.o : xc_input_params_mod.o
-qe_drivers_gga.o : qe_funct_corr_gga.o
-qe_drivers_gga.o : qe_funct_exch_gga.o
-qe_drivers_gga.o : xclib_error.o
-qe_drivers_d_gga.o : qe_kind.o
-qe_drivers_d_gga.o : qe_constants.o
-qe_drivers_d_gga.o : xc_input_params_mod.o
-qe_drivers_d_gga.o : qe_drivers_gga.o
+qe_drivers_lda_lsda.o : qe_funct_corr_lda_lsda.o
+qe_drivers_lda_lsda.o : qe_funct_exch_lda_lsda.o
+qe_drivers_lda_lsda.o : qe_kind.o
+qe_drivers_lda_lsda.o : xc_input_params_mod.o
+qe_drivers_mgga.o : qe_funct_mgga.o
 qe_drivers_mgga.o : qe_kind.o
 qe_drivers_mgga.o : xc_input_params_mod.o
-qe_drivers_mgga.o : qe_funct_mgga.o
-qe_drivers_mgga.o : xclib_error.o
-xc_wrapper_lda_lsda.o : qe_kind.o
-xc_wrapper_lda_lsda.o : xc_input_params_mod.o
-xc_wrapper_lda_lsda.o : qe_drivers_lda_lsda.o
-xc_wrapper_lda_lsda.o : xclib_error.o
-xc_wrapper_d_lda_lsda.o : qe_kind.o
-xc_wrapper_d_lda_lsda.o : xc_input_params_mod.o
-xc_wrapper_d_lda_lsda.o : qe_drivers_d_lda_lsda.o
-xc_wrapper_d_lda_lsda.o : xclib_error.o
-xc_wrapper_gga.o : qe_kind.o
-xc_wrapper_gga.o : xc_input_params_mod.o
-xc_wrapper_gga.o : qe_drivers_gga.o
-xc_wrapper_gga.o : xclib_error.o
+qe_funct_corr_gga.o : qe_funct_corr_lda_lsda.o
+qe_funct_corr_gga.o : qe_kind.o
+qe_funct_corr_lda_lsda.o : qe_kind.o
+qe_funct_exch_gga.o : qe_kind.o
+qe_funct_exch_lda_lsda.o : qe_constants.o
+qe_funct_exch_lda_lsda.o : qe_kind.o
+qe_funct_mgga.o : qe_constants.o
+qe_funct_mgga.o : qe_funct_corr_gga.o
+qe_funct_mgga.o : qe_funct_corr_lda_lsda.o
+qe_funct_mgga.o : qe_funct_exch_lda_lsda.o
+qe_funct_mgga.o : qe_kind.o
+xc_beef_interface.o : qe_kind.o
+xc_input_params_mod.o : qe_kind.o
+xc_lib.o : dft_mod.o
+xc_lib.o : qe_kind.o
+xc_wrapper_d_gga.o : qe_constants.o
+xc_wrapper_d_gga.o : qe_drivers_d_gga.o
 xc_wrapper_d_gga.o : qe_kind.o
 xc_wrapper_d_gga.o : xc_input_params_mod.o
-xc_wrapper_d_gga.o : qe_drivers_d_gga.o
-xc_wrapper_d_gga.o : xclib_error.o
+xc_wrapper_d_lda_lsda.o : qe_drivers_d_lda_lsda.o
+xc_wrapper_d_lda_lsda.o : qe_kind.o
+xc_wrapper_d_lda_lsda.o : xc_input_params_mod.o
+xc_wrapper_gga.o : qe_drivers_gga.o
+xc_wrapper_gga.o : qe_kind.o
+xc_wrapper_gga.o : xc_input_params_mod.o
+xc_wrapper_lda_lsda.o : qe_drivers_lda_lsda.o
+xc_wrapper_lda_lsda.o : qe_kind.o
+xc_wrapper_lda_lsda.o : xc_input_params_mod.o
+xc_wrapper_mgga.o : dft_mod.o
+xc_wrapper_mgga.o : qe_drivers_mgga.o
 xc_wrapper_mgga.o : qe_kind.o
 xc_wrapper_mgga.o : xc_input_params_mod.o
-xc_wrapper_mgga.o : qe_drivers_mgga.o
-xc_lib.o : xc_input_params_mod.o
-xc_lib.o : qe_kind.o
-xc_lib.o : dft_mod.o
-xclib_test.o : qe_kind.o
+xclib_error.o : xclib_para_m.o
 xclib_test.o : qe_constants.o
+xclib_test.o : qe_kind.o
 xclib_test.o : xc_lib.o
 xclib_test.o : xclib_para_m.o
-xclib_test.o : xc_wrapper_lda_lsda.o
-xclib_test.o : xc_wrapper_mgga.o
-xclib_test.o : xc_wrapper_d_lda_lsda.o
-xclib_test.o : xc_wrapper_d_gga.o

install/makedeps.sh

@@ -140,9 +140,11 @@ for dir in $dirs; do
         if test "$DIR" = "Modules"
         then
             sed '/@mbd@/d' make.depend > tmp; mv tmp make.depend
+        fi
 
         if test "$DIR" = "XClib"
         then
+            sed '/@xc_f90_lib_m@/d' make.depend > tmp; mv tmp make.depend
             sed '/@omp_lib@/d' make.depend > tmp; mv tmp make.depend
         fi