[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

13 files changed, 25 insertions, 70 deletions

diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am
index 4a76380..23757b3 100644
--- a/c++/examples/Makefile.am
+++ b/c++/examples/Makefile.am
@@ -43,7 +43,7 @@ chunks.chkexe_: extend_ds.chkexe_
 # These are the files that 'make clean' (and derivatives) will remove from this
 # directory.  Since automake doesn't know about the examples, we need to
 # tell it to clean the example programs, too.
-MOSTLYCLEANFILES+=*.h5
+MOSTLYCLEANFILES+=*.h5 $(EXTRA_PROG:=.o)
 CLEANFILES=$(EXTRA_PROG)
 
 # Tell conclude.am that these are C++ tests.
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index eacb2ab..047ae78 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -277,7 +277,7 @@ H5FC_PP = $(bindir)/h5pfc
 # These are the files that 'make clean' (and derivatives) will remove from this
 # directory.  Since automake doesn't know about the examples, we need to
 # tell it to clean the example programs, too.
-MOSTLYCLEANFILES = *.chkexe *.chksh *.h5
+MOSTLYCLEANFILES = *.chkexe *.chksh *.h5 $(EXTRA_PROG:=.o)
 
 # Use h5c++ to build examples, instead of reguar C++ compiler
 H5CPP = $(bindir)/h5c++
diff --git a/config/lt_vers.am b/config/lt_vers.am
index ec78cd1..0146cc5 100644
--- a/config/lt_vers.am
+++ b/config/lt_vers.am
@@ -7,10 +7,12 @@ LT_VERS_AGE = 2
 ## If the API changes *at all*, increment LT_VERS_INTERFACE and
 ## reset LT_VERS_REVISION to 0.
 ##
-## If the API changes but no functions are removed, also increment
-## LT_VERS_AGE.
-## If any functions are removed from the API, reset LT_VERS_AGE
-## to 0.
+## If the API changes but no function signatures are removed or
+## changed, also increment LT_VERS_AGE.
+## If any functions are removed from the API, or their signatures
+## are changed reset LT_VERS_AGE to 0 to indicate that previous
+## versions of the API are not necessarily compatible with this
+## version.
 ##
 ## If the source changes but there are no API changes, increment
 ## LT_VERS_REVISION.  This will happen automatically when
diff --git a/configure b/configure
index e62e485..4e7c960 100755
--- a/configure
+++ b/configure
@@ -3425,7 +3425,7 @@ ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in f90 pgf90 slf90 f95 g95 xlf95 efc ifort
+  for ac_prog in f90 pgf90 slf90 f95 g95 xlf95 efc ifort ftn
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -3467,7 +3467,7 @@ fi
 fi
 if test -z "$FC"; then
   ac_ct_FC=$FC
-  for ac_prog in f90 pgf90 slf90 f95 g95 xlf95 efc ifort
+  for ac_prog in f90 pgf90 slf90 f95 g95 xlf95 efc ifort ftn
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
diff --git a/configure.in b/configure.in
index 5abffe2..d160737 100644
--- a/configure.in
+++ b/configure.in
@@ -313,7 +313,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
   dnl --------------------------------------------------------------------
   dnl Check for a Fortran 9X compiler and how to include modules.
   dnl 
-  AC_PROG_FC([f90 pgf90 slf90 f95 g95 xlf95 efc ifort],)
+  AC_PROG_FC([f90 pgf90 slf90 f95 g95 xlf95 efc ifort ftn],)
   AC_F9X_MODS
 
   dnl It seems that libtool (as of Libtool 1.5.14) is trying to
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 07f659b..1e4b883 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -22,8 +22,6 @@ include $(top_srcdir)/config/commence.am
 
 if BUILD_PARALLEL_CONDITIONAL
   TEST_PROG_PARA = ph5example
-else
-  TEST_PROG_PARA =
 endif
 
 # Example programs.
@@ -47,7 +45,8 @@ INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c   \
           h5_reference.c h5_drivers.c ph5example.c
 
 # We need to tell automake what to clean
-CLEANFILES=*.h5 *.raw *.meta *.clog $(TEST_PROG) ph5example *.o
+MOSTLYCLEANFILES+=*.h5 *.raw *.meta *.clog *.o
+CLEANFILES=$(TEST_PROG) $(TEST_PROG_PARA)
 
 # Additional dependencies for each program are listed below.
 $(EXTRA_PROG): $(LIBHDF5)
@@ -86,7 +85,7 @@ install-examples: $(EXAMPLEDIR) $(INSTALL_FILES)
 
 uninstall-examples:
 	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then                                 \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES).c;              \
+	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);              \
 	fi
 
 check-install:
diff --git a/examples/Makefile.in b/examples/Makefile.in
index a8d6fcf..ee73209 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -273,8 +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
-@BUILD_PARALLEL_CONDITIONAL_FALSE@TEST_PROG_PARA = 
+
+# We need to tell automake what to clean
+MOSTLYCLEANFILES = *.chkexe *.chksh *.h5 *.raw *.meta *.clog *.o
 @BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = ph5example
 
 # Example programs.
@@ -298,9 +299,7 @@ INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c   \
           h5_compound.c h5_group.c h5_select.c h5_attribute.c h5_mount.c \
           h5_reference.c h5_drivers.c ph5example.c
 
-
-# We need to tell automake what to clean
-CLEANFILES = *.h5 *.raw *.meta *.clog $(TEST_PROG) ph5example *.o
+CLEANFILES = $(TEST_PROG) $(TEST_PROG_PARA)
 
 # How to install examples
 # There are a lot of rules because automake does not know about
@@ -518,7 +517,7 @@ install-examples: $(EXAMPLEDIR) $(INSTALL_FILES)
 
 uninstall-examples:
 	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then                                 \
-	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES).c;              \
+	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);              \
 	fi
 
 check-install:
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
diff --git a/tools/h5dump/Makefile.am b/tools/h5dump/Makefile.am
index 42b067c..f7ceee4 100644
--- a/tools/h5dump/Makefile.am
+++ b/tools/h5dump/Makefile.am
@@ -24,7 +24,7 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
 
 # Test programs and scripts
 TEST_PROG=h5dumpgentest
-TEST_SCRIPT=testh5dump.sh $(top_srcdir)/tools/h5dump/testh5dumpxml.sh
+TEST_SCRIPT=testh5dump.sh $(srcdir)/testh5dumpxml.sh
 
 check_PROGRAMS=$(TEST_PROG)
 check_SCRIPTS=$(TEST_SCRIPT)
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 7e8f168..fd8d44e 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -316,7 +316,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
 
 # Test programs and scripts
 TEST_PROG = h5dumpgentest
-TEST_SCRIPT = testh5dump.sh $(top_srcdir)/tools/h5dump/testh5dumpxml.sh
+TEST_SCRIPT = testh5dump.sh $(srcdir)/testh5dumpxml.sh
 check_SCRIPTS = $(TEST_SCRIPT)
 
 # All the programs depend on the hdf5 and h5tools libraries