[svn-r11083] Purpose:

Bug fixes

Description:
A number of minor changes to Makefiles.  Some files will now be cleaned
properly, some comments are more informative, etc.


Platforms tested:
heping, mir, modi4

4 files changed, 4 insertions, 49 deletions

diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am
index 88d1c98..f01629a 100644
--- a/fortran/examples/Makefile.am
+++ b/fortran/examples/Makefile.am
@@ -45,6 +45,7 @@ INSTALL_FILES=dsetexample.f90 fileexample.f90 rwdsetexample.f90             \
        refregexample.f90 mountexample.f90 compound.f90 ph5example.f90
 
 # Tell automake which files to clean
+MOSTLYCLEANFILES+=$(EXTRA_PROG:=.o)
 CLEANFILES=*.h5 $(EXTRA_PROG)
 
 # Mark this directory as part of the Fortran API
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index deabfd9..22ee3ed 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -273,7 +273,9 @@ H5FC = $(bindir)/h5fc
 H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe and .chksh files are used to mark tests that have run successfully.
-MOSTLYCLEANFILES = *.chkexe *.chksh
+
+# Tell automake which files to clean
+MOSTLYCLEANFILES = *.chkexe *.chksh $(EXTRA_PROG:=.o)
 
 # Compile parallel fortran examples only if parallel is enabled
 @BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = ph5example
@@ -298,8 +300,6 @@ INSTALL_FILES = dsetexample.f90 fileexample.f90 rwdsetexample.f90             \
        hyperslab.f90 selectele.f90 grpit.f90 refobjexample.f90              \
        refregexample.f90 mountexample.f90 compound.f90 ph5example.f90
 
-
-# Tell automake which files to clean
 CLEANFILES = *.h5 $(EXTRA_PROG)
 
 # Mark this directory as part of the Fortran API
diff --git a/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am
index eec6005..75c1588 100644
--- a/fortran/testpar/Makefile.am
+++ b/fortran/testpar/Makefile.am
@@ -42,29 +42,6 @@ LDADD=$(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
 # Mark this directory as part of the Fortran API
 HDF_FORTRAN=yes
 
-# 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
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index fec16f7..b461725 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -723,29 +723,6 @@ 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