[svn-r7816] Purpose:

    Improvement

Description:
    If the library is built in parallel mode, then name the "h5cc" and
    "h5fc" programs "h5pcc" and "h5pfc" resp. This saves the user from
    worrying about mixing serial and parallel builds of the library and
    having to specify the pathnames and so-forth.

Platforms tested:
    Linux (w/ parallel & Fortran)
    Modi4 (w/ parallel & Fortran)
    Sol (Serial & Fortran & C++)

Misc. update:
    Updated release/docs/RELEASE

1 files changed, 106 insertions, 21 deletions

diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index 745c15d..e074539 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -24,12 +24,13 @@ hdf5_builddir=$(top_builddir)/src
 
 ## Replace building FC with the just installed h5fc
 FC=$(bindir)/h5fc
+FC_PP=$(bindir)/h5pfc
 
 ## These are the programs that `make all' or `make tests' will build and which
 ## `make check' will run. List them in the order they should be run.
-TEST_PROGS=dsetexample fileexample rwdsetexample attrexample groupexample	\
-	   grpsexample grpdsetexample hyperslab selectele grpit refobjexample	\
-	   refregexample mountexample compound
+TEST_PROGS=dsetexample fileexample rwdsetexample attrexample groupexample       \
+           grpsexample grpdsetexample hyperslab selectele grpit refobjexample   \
+           refregexample mountexample compound
 
 ## These are the files that `make clean' (and derivatives) will remove from
 ## this directory.
@@ -38,10 +39,10 @@ CLEAN=*.h5
 ## List all source files here. The list of object files will be
 ## created by replacing the `.f90' with a `.o'. This list is necessary
 ## for building automatic dependencies.
-TEST_SRC=dsetexample.f90 fileexample.f90 rwdsetexample.f90 attrexample.f90	\
-	 groupexample.f90 grpsexample.f90 grpdsetexample.f90 hyperslab.f90	\
-	 selectele.f90 grpit.f90 refobjexample.f90 refregexample.f90		\
-	 mountexample.f90 compound.f90
+TEST_SRC=dsetexample.f90 fileexample.f90 rwdsetexample.f90 attrexample.f90      \
+         groupexample.f90 grpsexample.f90 grpdsetexample.f90 hyperslab.f90      \
+         selectele.f90 grpit.f90 refobjexample.f90 refregexample.f90            \
+         mountexample.f90 compound.f90
 TEST_OBJ=$(TEST_SRC:.f90=.lo)
 
 EXAMPLE_PROGS=$(TEST_SRC)
@@ -49,45 +50,129 @@ EXAMPLE_PROGS=$(TEST_SRC)
 ## How to build the programs... they all depend on the Fortran & C hdf5 libraries
 $(TEST_PROGS): $(LIBHDF5)
 dsetexample: $(srcdir)/dsetexample.f90
-	$(FC) -o $@ $(srcdir)/dsetexample.f90
+	@if test "X$(PARALLEL)" = "Xno"; then					\
+	  echo $(FC) -o $@ $<;							\
+	  $(FC) -o $@ $<;							\
+	else									\
+	  echo $(FC_PP) -o $@ $<;						\
+	  $(FC_PP) -o $@ $<;							\
+	fi
 
 fileexample: $(srcdir)/fileexample.f90
-	$(FC) -o $@ $(srcdir)/fileexample.f90
+	@if test "X$(PARALLEL)" = "Xno"; then					\
+	  echo $(FC) -o $@ $<;							\
+	  $(FC) -o $@ $<;							\
+	else									\
+	  echo $(FC_PP) -o $@ $<;						\
+	  $(FC_PP) -o $@ $<;							\
+	fi
 
 rwdsetexample: $(srcdir)/rwdsetexample.f90
-	$(FC) -o $@ $(srcdir)/rwdsetexample.f90
+	@if test "X$(PARALLEL)" = "Xno"; then					\
+	  echo $(FC) -o $@ $<;							\
+	  $(FC) -o $@ $<;							\
+	else									\
+	  echo $(FC_PP) -o $@ $<;						\
+	  $(FC_PP) -o $@ $<;							\
+	fi
 
 attrexample: $(srcdir)/attrexample.f90
-	$(FC) -o $@ $(srcdir)/attrexample.f90
+	@if test "X$(PARALLEL)" = "Xno"; then					\
+	  echo $(FC) -o $@ $<;							\
+	  $(FC) -o $@ $<;							\
+	else									\
+	  echo $(FC_PP) -o $@ $<;						\
+	  $(FC_PP) -o $@ $<;							\
+	fi
 
 groupexample: $(srcdir)/groupexample.f90
-	$(FC) -o $@ $(srcdir)/groupexample.f90
+	@if test "X$(PARALLEL)" = "Xno"; then					\
+	  echo $(FC) -o $@ $<;							\
+	  $(FC) -o $@ $<;							\
+	else									\
+	  echo $(FC_PP) -o $@ $<;						\
+	  $(FC_PP) -o $@ $<;							\
+	fi
 
 grpsexample: $(srcdir)/grpsexample.f90
-	$(FC) -o $@ $(srcdir)/grpsexample.f90
+	@if test "X$(PARALLEL)" = "Xno"; then					\
+	  echo $(FC) -o $@ $<;							\
+	  $(FC) -o $@ $<;							\
+	else									\
+	  echo $(FC_PP) -o $@ $<;						\
+	  $(FC_PP) -o $@ $<;							\
+	fi
 
 grpdsetexample: $(srcdir)/grpdsetexample.f90
-	$(FC) -o $@ $(srcdir)/grpdsetexample.f90
+	@if test "X$(PARALLEL)" = "Xno"; then					\
+	  echo $(FC) -o $@ $<;							\
+	  $(FC) -o $@ $<;							\
+	else									\
+	  echo $(FC_PP) -o $@ $<;						\
+	  $(FC_PP) -o $@ $<;							\
+	fi
 
 hyperslab: $(srcdir)/hyperslab.f90
-	$(FC) -o $@ $(srcdir)/hyperslab.f90
+	@if test "X$(PARALLEL)" = "Xno"; then					\
+	  echo $(FC) -o $@ $<;							\
+	  $(FC) -o $@ $<;							\
+	else									\
+	  echo $(FC_PP) -o $@ $<;						\
+	  $(FC_PP) -o $@ $<;							\
+	fi
 
 selectele: $(srcdir)/selectele.f90
-	$(FC) -o $@ $(srcdir)/selectele.f90
+	@if test "X$(PARALLEL)" = "Xno"; then					\
+	  echo $(FC) -o $@ $<;							\
+	  $(FC) -o $@ $<;							\
+	else									\
+	  echo $(FC_PP) -o $@ $<;						\
+	  $(FC_PP) -o $@ $<;							\
+	fi
 
 grpit: $(srcdir)/grpit.f90
-	$(FC) -o $@ $(srcdir)/grpit.f90
+	@if test "X$(PARALLEL)" = "Xno"; then					\
+	  echo $(FC) -o $@ $<;							\
+	  $(FC) -o $@ $<;							\
+	else									\
+	  echo $(FC_PP) -o $@ $<;						\
+	  $(FC_PP) -o $@ $<;							\
+	fi
 
 refobjexample: $(srcdir)/refobjexample.f90
-	$(FC) -o $@ $(srcdir)/refobjexample.f90
+	@if test "X$(PARALLEL)" = "Xno"; then					\
+	  echo $(FC) -o $@ $<;							\
+	  $(FC) -o $@ $<;							\
+	else									\
+	  echo $(FC_PP) -o $@ $<;						\
+	  $(FC_PP) -o $@ $<;							\
+	fi
 
 refregexample: $(srcdir)/refregexample.f90
-	$(FC) -o $@ $(srcdir)/refregexample.f90
+	@if test "X$(PARALLEL)" = "Xno"; then					\
+	  echo $(FC) -o $@ $<;							\
+	  $(FC) -o $@ $<;							\
+	else									\
+	  echo $(FC_PP) -o $@ $<;						\
+	  $(FC_PP) -o $@ $<;							\
+	fi
 
 mountexample: $(srcdir)/mountexample.f90
-	$(FC) -o $@ $(srcdir)/mountexample.f90
+	@if test "X$(PARALLEL)" = "Xno"; then					\
+	  echo $(FC) -o $@ $<;							\
+	  $(FC) -o $@ $<;							\
+	else									\
+	  echo $(FC_PP) -o $@ $<;						\
+	  $(FC_PP) -o $@ $<;							\
+	fi
 
 compound: $(srcdir)/compound.f90
-	$(FC) -o $@ $(srcdir)/compound.f90
+	@if test "X$(PARALLEL)" = "Xno"; then					\
+	  echo $(FC) -o $@ $<;							\
+	  $(FC) -o $@ $<;							\
+	else									\
+	  echo $(FC_PP) -o $@ $<;						\
+	  $(FC_PP) -o $@ $<;							\
+	fi
 
 @CONCLUDE@