diff options
| -rwxr-xr-x | Makefile.am | 14 | ||||
| -rw-r--r-- | Makefile.in | 44 | ||||
| -rw-r--r-- | c++/Makefile.am | 10 | ||||
| -rw-r--r-- | c++/Makefile.in | 14 | ||||
| -rw-r--r-- | c++/examples/Makefile.am | 7 | ||||
| -rw-r--r-- | c++/examples/Makefile.in | 7 | ||||
| -rw-r--r-- | fortran/Makefile.am | 10 | ||||
| -rw-r--r-- | fortran/Makefile.in | 14 |
8 files changed, 33 insertions, 87 deletions
diff --git a/Makefile.am b/Makefile.am index e9b8658..ec07fc7 100755 --- a/Makefile.am +++ b/Makefile.am @@ -104,23 +104,9 @@ install-exec-local: uninstall-local: @cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall -# Clean and mostlyclean need to recurse into examples and perform -# directories unless they've already been distcleaned. -clean-local: - @@SETX@; for d in examples perform; do \ - if test -f $$d/Makefile; then \ - (cd $$d && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \ - fi; \ - done - # Some C++ compilers/linkers will create a directory named ii_files in # the root directory, which should be cleaned. mostlyclean-local: - @@SETX@; for d in examples perform; do \ - if test -f $$d/Makefile; then \ - (cd $$d && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \ - fi; \ - done; \ if test -d ii_files; then \ $(RM) -rf ii_files; \ fi diff --git a/Makefile.in b/Makefile.in index 89e3edc..dd81ed7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -690,7 +690,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive -clean-am: clean-generic clean-libtool clean-local mostlyclean-am +clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -743,20 +743,20 @@ uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local \ am--refresh check check-am clean clean-generic clean-libtool \ - clean-local clean-recursive ctags ctags-recursive dist \ - dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \ - distcheck distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-exec-local install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installcheck-local installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-local mostlyclean-recursive \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-info-am uninstall-local + clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \ + dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-libtool distclean-recursive \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-exec-local install-info install-info-am install-man \ + install-strip installcheck installcheck-am installcheck-local \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-libtool \ + mostlyclean-local mostlyclean-recursive pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am uninstall-info-am \ + uninstall-local # check-install is a synonym for installcheck. @@ -791,23 +791,9 @@ install-exec-local: uninstall-local: @cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall -# Clean and mostlyclean need to recurse into examples and perform -# directories unless they've already been distcleaned. -clean-local: - @@SETX@; for d in examples perform; do \ - if test -f $$d/Makefile; then \ - (cd $$d && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \ - fi; \ - done - # Some C++ compilers/linkers will create a directory named ii_files in # the root directory, which should be cleaned. mostlyclean-local: - @@SETX@; for d in examples perform; do \ - if test -f $$d/Makefile; then \ - (cd $$d && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \ - fi; \ - done; \ if test -d ii_files; then \ $(RM) -rf ii_files; \ fi diff --git a/c++/Makefile.am b/c++/Makefile.am index 042fb92..986aca4 100644 --- a/c++/Makefile.am +++ b/c++/Makefile.am @@ -25,16 +25,6 @@ if BUILD_CXX_CONDITIONAL endif DIST_SUBDIRS = src test examples -# Clean and mostlyclean need to recurse into examples directory -clean-local: - @if test -f examples/Makefile; then \ - (cd examples && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \ - fi; -mostlyclean-local: - @if test -f examples/Makefile; then \ - (cd examples && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \ - fi; - # Install examples install-examples uninstall-examples: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; diff --git a/c++/Makefile.in b/c++/Makefile.in index e8cf00f..06f978a 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -553,7 +553,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive -clean-am: clean-generic clean-libtool clean-local mostlyclean-am +clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive -rm -f Makefile @@ -603,7 +603,7 @@ uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \ check-TESTS check-am clean clean-generic clean-libtool \ - clean-local clean-recursive ctags ctags-recursive distclean \ + clean-recursive ctags ctags-recursive distclean \ distclean-generic distclean-libtool distclean-recursive \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-exec \ @@ -622,16 +622,6 @@ uninstall-info: uninstall-info-recursive # as well. check-install: installcheck -# Clean and mostlyclean need to recurse into examples directory -clean-local: - @if test -f examples/Makefile; then \ - (cd examples && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \ - fi; -mostlyclean-local: - @if test -f examples/Makefile; then \ - (cd examples && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \ - fi; - # Install examples install-examples uninstall-examples: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am index 995964b..d729521 100644 --- a/c++/examples/Makefile.am +++ b/c++/examples/Makefile.am @@ -61,6 +61,13 @@ install-data-local: uninstall-local: @$(MAKE) uninstall-examples +# Some C++ compilers/linkers will create a directory named ii_files, +# which should be cleaned. +mostlyclean-local: + if test -d ii_files; then \ + $(RM) -rf ii_files; \ + fi + # Install source files, which are the examples with .cpp suffixes. Do the same # for uninstall. install-examples: $(EXAMPLEDIR) diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 56092e6..f146c56 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -507,6 +507,13 @@ install-data-local: uninstall-local: @$(MAKE) uninstall-examples +# Some C++ compilers/linkers will create a directory named ii_files, +# which should be cleaned. +mostlyclean-local: + if test -d ii_files; then \ + $(RM) -rf ii_files; \ + fi + # Install source files, which are the examples with .cpp suffixes. Do the same # for uninstall. install-examples: $(EXAMPLEDIR) diff --git a/fortran/Makefile.am b/fortran/Makefile.am index 9a988d9..f810e3b 100644 --- a/fortran/Makefile.am +++ b/fortran/Makefile.am @@ -36,16 +36,6 @@ endif # All directories that have Makefiles DIST_SUBDIRS=src test testpar examples -# Clean and mostlyclean need to recurse into examples directory -clean-local: - @if test -f examples/Makefile; then \ - (cd examples && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \ - fi; -mostlyclean-local: - @if test -f examples/Makefile; then \ - (cd examples && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \ - fi; - # Install examples install-examples uninstall-examples: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; diff --git a/fortran/Makefile.in b/fortran/Makefile.in index b6fefc0..ab70f03 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -562,7 +562,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive -clean-am: clean-generic clean-libtool clean-local mostlyclean-am +clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive -rm -f Makefile @@ -612,7 +612,7 @@ uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \ check-TESTS check-am clean clean-generic clean-libtool \ - clean-local clean-recursive ctags ctags-recursive distclean \ + clean-recursive ctags ctags-recursive distclean \ distclean-generic distclean-libtool distclean-recursive \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-exec \ @@ -631,16 +631,6 @@ uninstall-info: uninstall-info-recursive # as well. check-install: installcheck -# Clean and mostlyclean need to recurse into examples directory -clean-local: - @if test -f examples/Makefile; then \ - (cd examples && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \ - fi; -mostlyclean-local: - @if test -f examples/Makefile; then \ - (cd examples && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \ - fi; - # Install examples install-examples uninstall-examples: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; |