summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-04-01 19:41:57 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-04-01 19:41:57 (GMT)
commit7f5e1dfe31696bddb3967865af52801a2b38bb7e (patch)
treeb0cb697060dd1d93761380309869013506a3e66b
parent3cf7dbbf1d8648536fd923353c2b9599513f64f2 (diff)
downloadhdf5-7f5e1dfe31696bddb3967865af52801a2b38bb7e.zip
hdf5-7f5e1dfe31696bddb3967865af52801a2b38bb7e.tar.gz
hdf5-7f5e1dfe31696bddb3967865af52801a2b38bb7e.tar.bz2
[svn-r10533] Purpose:
Feature Description: Added support for conditional compilation of parallel Fortran examples. No such examples exist currently, but it should be possible to add them to the Makefile.am with no fuss and have them compile only when parallel is enabled. Platforms tested: eirene, copper, modi4 Misc. update:
-rw-r--r--fortran/examples/Makefile.am7
-rw-r--r--fortran/examples/Makefile.in5
2 files changed, 10 insertions, 2 deletions
diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am
index 1239c13..0f9dbd2 100644
--- a/fortran/examples/Makefile.am
+++ b/fortran/examples/Makefile.am
@@ -20,6 +20,11 @@
include $(top_srcdir)/config/commence.am
+# Compile parallel fortran examples only if parallel is enabled
+if BUILD_PARALLEL_CONDITIONAL
+ TEST_PROG_PARA=
+endif
+
# These are the programs that 'make all' or 'make tests' will build and
# that 'make check' will run. List them in the order in which they should
# be run.
@@ -30,7 +35,7 @@ TEST_PROG=dsetexample fileexample rwdsetexample attrexample groupexample \
refregexample mountexample compound
# Tell configure.in when to build examples
-EXTRA_PROG=$(TEST_PROG)
+EXTRA_PROG=$(TEST_PROG) $(TEST_PROG_PARA)
EXAMPLE_PROG=$(EXTRA_PROG)
# List files to be installed here
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index cae5546..83c0fdc 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -275,6 +275,9 @@ H5CC_PP = $(bindir)/h5pcc
H5FC = $(bindir)/h5fc
H5FC_PP = $(bindir)/h5pfc
+# Compile parallel fortran examples only if parallel is enabled
+@BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA =
+
# These are the programs that 'make all' or 'make tests' will build and
# that 'make check' will run. List them in the order in which they should
# be run.
@@ -286,7 +289,7 @@ TEST_PROG = dsetexample fileexample rwdsetexample attrexample groupexample \
# Tell configure.in when to build examples
-EXTRA_PROG = $(TEST_PROG)
+EXTRA_PROG = $(TEST_PROG) $(TEST_PROG_PARA)
EXAMPLE_PROG = $(EXTRA_PROG)
# List files to be installed here