From 17b3d2b13e272849b88402c3ebeb1214ad61ac02 Mon Sep 17 00:00:00 2001 From: James Laird Date: Wed, 4 May 2005 12:00:25 -0500 Subject: [svn-r10727] Purpose: Bug fix Description: Removed Makefile.am for installing .mod files from fortran/testpar. Removed warnings in H5match_types.c Platforms tested: heping Misc. update: --- fortran/testpar/Makefile.am | 36 +++++++++++----------- fortran/testpar/Makefile.in | 75 ++++++++++++++++++++++----------------------- 2 files changed, 54 insertions(+), 57 deletions(-) diff --git a/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am index b6b6b3f..7a6b141 100644 --- a/fortran/testpar/Makefile.am +++ b/fortran/testpar/Makefile.am @@ -46,24 +46,24 @@ HDF_FORTRAN=yes # (e.g., different capitalizations) on different platforms. Write rules # for them explicitly rather than trying to teach automake about them. # They should be installed as headers and removed during clean. -maintainer-clean-local: clean-local -distclean-local: clean-local -clean-local: - if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ - $(RM) *.$(F9XMODEXT); \ - fi - -install-data-local: - if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ - $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \ - fi - -uninstall-local: - if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \ - if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \ - set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \ - fi; \ - fi +#maintainer-clean-local: clean-local +#distclean-local: clean-local +#clean-local: +# if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ +# $(RM) *.$(F9XMODEXT); \ +# fi +# +#install-data-local: +# if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ +# $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \ +# fi +# +#uninstall-local: +# if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \ +# if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \ +# set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \ +# fi; \ +# fi # Put in dependencies to the THDF5 module so that things will be built # in the correct order. diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 32b3f69..173fc3b 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -506,13 +506,13 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ mostlyclean-am distclean: distclean-am -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-local distclean-tags + distclean-libtool distclean-tags dvi: dvi-am @@ -524,7 +524,7 @@ info: info-am info-am: -install-data-am: install-data-local +install-data-am: install-exec-am: @@ -536,8 +536,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic \ - maintainer-clean-local +maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -552,46 +551,21 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-local +uninstall-am: uninstall-info-am .PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \ - clean clean-checkPROGRAMS clean-generic clean-libtool \ - clean-local ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-local \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-local install-exec install-exec-am install-info \ + clean clean-checkPROGRAMS clean-generic clean-libtool ctags \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic maintainer-clean-local mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-info-am uninstall-local + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-info-am -# Fortran module files can have different extensions and different names -# (e.g., different capitalizations) on different platforms. Write rules -# for them explicitly rather than trying to teach automake about them. -# They should be installed as headers and removed during clean. -maintainer-clean-local: clean-local -distclean-local: clean-local -clean-local: - if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ - $(RM) *.$(F9XMODEXT); \ - fi - -install-data-local: - if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ - $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \ - fi - -uninstall-local: - if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \ - if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \ - set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \ - fi; \ - fi - # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. build-lib: $(LIB) @@ -713,6 +687,29 @@ check-vfd: fi; \ done +# Fortran module files can have different extensions and different names +# (e.g., different capitalizations) on different platforms. Write rules +# for them explicitly rather than trying to teach automake about them. +# They should be installed as headers and removed during clean. +#maintainer-clean-local: clean-local +#distclean-local: clean-local +#clean-local: +# if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ +# $(RM) *.$(F9XMODEXT); \ +# fi +# +#install-data-local: +# if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ +# $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \ +# fi +# +#uninstall-local: +# if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \ +# if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \ +# set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \ +# fi; \ +# fi + # Put in dependencies to the THDF5 module so that things will be built # in the correct order. #thdf5.lo: thdf5.o -- cgit v0.12