From 0dadd203994d8fd5abc639e733038953d798444d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCdepohl?= Date: Thu, 12 Jun 2014 17:23:05 +0200 Subject: [PATCH] Fix cleaning config-f90.h should not be delete by make clean, as it is created by configure, not by the build processes. Also, better keep the directories modules/ and .fortran_dependencies/ and only delete their contents. --- ELPA_2014.06/Makefile.am | 8 +++++--- ELPA_2014.06/Makefile.in | 24 +++++++++++++----------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/ELPA_2014.06/Makefile.am b/ELPA_2014.06/Makefile.am index 4a1b9f95..d4796133 100644 --- a/ELPA_2014.06/Makefile.am +++ b/ELPA_2014.06/Makefile.am @@ -276,11 +276,13 @@ CLEANFILES = \ elpa2_test_real_choose_kernel_with_api.sh \ elpa2_test_complex_choose_kernel_with_api.sh \ elpa2_print_kernels.sh \ - *.i \ - config-f90.h + *.i clean-local: - -rm -rf modules .fortran_dependencies + -rm -rf modules/* .fortran_dependencies/* + +distclean-local: + -rm config-f90.h EXTRA_DIST = fdep/fortran_dependencies.pl fdep/fortran_dependencies.mk diff --git a/ELPA_2014.06/Makefile.in b/ELPA_2014.06/Makefile.in index 37ad0b61..c9870918 100644 --- a/ELPA_2014.06/Makefile.in +++ b/ELPA_2014.06/Makefile.in @@ -878,8 +878,7 @@ CLEANFILES = \ elpa2_test_real_choose_kernel_with_api.sh \ elpa2_test_complex_choose_kernel_with_api.sh \ elpa2_print_kernels.sh \ - *.i \ - config-f90.h + *.i EXTRA_DIST = fdep/fortran_dependencies.pl fdep/fortran_dependencies.mk all: config.h @@ -1832,7 +1831,7 @@ distclean: distclean-am -rm -rf src/elpa2_kernels/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags + distclean-hdr distclean-libtool distclean-local distclean-tags dvi: dvi-am @@ -1907,13 +1906,13 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \ cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ distcheck distclean distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-binPROGRAMS install-data \ - install-data-am install-dist_docDATA install-dist_filesDATA \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man \ + distclean-hdr distclean-libtool distclean-local distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dist_docDATA \ + install-dist_filesDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libLTLIBRARIES install-man \ install-nobase_elpa_includeHEADERS install-pdf install-pdf-am \ install-pkgconfigDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ @@ -1964,7 +1963,10 @@ elpa1.i: $(top_srcdir)/src/elpa1.F90 $(CPP) $(CPPFLAGS) -I$(top_builddir)/ -c $(top_srcdir)/src/elpa1.F90 -o $@ clean-local: - -rm -rf modules .fortran_dependencies + -rm -rf modules/* .fortran_dependencies/* + +distclean-local: + -rm config-f90.h @FORTRAN_MODULE_DEPS@ -- GitLab