diff options
| -rw-r--r-- | c++/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | c++/examples/Makefile.in | 2 | ||||
| -rw-r--r-- | c++/test/Makefile.in | 2 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | examples/Makefile.am | 5 | ||||
| -rw-r--r-- | examples/Makefile.in | 5 | ||||
| -rw-r--r-- | fortran/examples/Makefile.am | 3 | ||||
| -rw-r--r-- | fortran/examples/Makefile.in | 3 | ||||
| -rw-r--r-- | hl/c++/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | hl/c++/examples/Makefile.in | 2 | ||||
| -rw-r--r-- | hl/examples/Makefile.am | 3 | ||||
| -rw-r--r-- | hl/examples/Makefile.in | 3 | ||||
| -rw-r--r-- | hl/fortran/examples/Makefile.am | 4 | ||||
| -rw-r--r-- | hl/fortran/examples/Makefile.in | 4 |
14 files changed, 24 insertions, 18 deletions
diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am index f60b6d7..ad597c4 100644 --- a/c++/examples/Makefile.am +++ b/c++/examples/Makefile.am @@ -39,7 +39,7 @@ HDF_CXX=yes EXAMPLEDIR=$(docdir)/hdf5/examples/c++ # How to build programs using h5c++ -$(EXTRA_PROG): $(LIBHDF5) $(LIBH5CPP) +$(EXTRA_PROG): $(H5CPP) $(H5CPP) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp # List dependencies for each program. Normally, automake would take diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 41bd789..aaad5f9 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -528,7 +528,7 @@ readdata.chkexe_: create.chkexe_ chunks.chkexe_: extend_ds.chkexe_ # How to build programs using h5c++ -$(EXTRA_PROG): $(LIBHDF5) $(LIBH5CPP) +$(EXTRA_PROG): $(H5CPP) $(H5CPP) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp # List dependencies for each program. Normally, automake would take diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 51bc77d..e9684fd 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -230,6 +230,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -293,7 +294,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 13195 2007-01-25 08:35:44Z hdftest . +# From configure.in Id: configure.in 13198 2007-01-25 16:30:53Z jlaird . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.60 for HDF5 1.8.0-alpha5snap1. # diff --git a/examples/Makefile.am b/examples/Makefile.am index b6f4b8d..1981072 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -39,11 +39,12 @@ INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c \ h5_reference.c h5_drivers.c h5_extlink.c h5_elink_unix2win.c \ h5_ref2reg.c h5_shared_mesg.c ph5example.c -# Additional dependencies for each program are listed below. -$(EXTRA_PROG): $(LIBHDF5) +# How to build examples, using installed version of h5cc if BUILD_PARALLEL_CONDITIONAL +$(EXTRA_PROG): $(H5CC_PP) $(H5CC_PP) $(CFLAGS) -o $@ $(srcdir)/$@.c; else +$(EXTRA_PROG): $(H5CC) $(H5CC) $(CFLAGS) -o $@ $(srcdir)/$@.c; endif diff --git a/examples/Makefile.in b/examples/Makefile.in index b1597a3..2499328 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -533,9 +533,10 @@ uninstall-am: uninstall-info-am uninstall-local build-tests check-clean check-install check-p check-s check-vfd \ install-doc lib progs tests uninstall-doc _exec_check-s _test -# Additional dependencies for each program are listed below. -$(EXTRA_PROG): $(LIBHDF5) +# How to build examples, using installed version of h5cc +@BUILD_PARALLEL_CONDITIONAL_TRUE@$(EXTRA_PROG): $(H5CC_PP) @BUILD_PARALLEL_CONDITIONAL_TRUE@ $(H5CC_PP) $(CFLAGS) -o $@ $(srcdir)/$@.c; +@BUILD_PARALLEL_CONDITIONAL_FALSE@$(EXTRA_PROG): $(H5CC) @BUILD_PARALLEL_CONDITIONAL_FALSE@ $(H5CC) $(CFLAGS) -o $@ $(srcdir)/$@.c; # Two of the examples depend on files created by other examples. diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am index 1d258c7..3200f63 100644 --- a/fortran/examples/Makefile.am +++ b/fortran/examples/Makefile.am @@ -53,10 +53,11 @@ attrexample.chkexe_: rwdsetexample.chkexe_ # Tell automake how to build examples using h5fc # Additional dependencies for the examples are listed below -$(EXTRA_PROG): $(LIBHDF5) $(LIBH5F) if BUILD_PARALLEL_CONDITIONAL +$(EXTRA_PROG): $(H5FC_PP) $(H5FC_PP) $(FCFLAGS) -o $@ $(srcdir)/$@.f90; else +$(EXTRA_PROG): $(H5FC) $(H5FC) $(FCFLAGS) -o $@ $(srcdir)/$@.f90; endif diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 04b5775..0862d25 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -544,8 +544,9 @@ attrexample.chkexe_: rwdsetexample.chkexe_ # Tell automake how to build examples using h5fc # Additional dependencies for the examples are listed below -$(EXTRA_PROG): $(LIBHDF5) $(LIBH5F) +@BUILD_PARALLEL_CONDITIONAL_TRUE@$(EXTRA_PROG): $(H5FC_PP) @BUILD_PARALLEL_CONDITIONAL_TRUE@ $(H5FC_PP) $(FCFLAGS) -o $@ $(srcdir)/$@.f90; +@BUILD_PARALLEL_CONDITIONAL_FALSE@$(EXTRA_PROG): $(H5FC) @BUILD_PARALLEL_CONDITIONAL_FALSE@ $(H5FC) $(FCFLAGS) -o $@ $(srcdir)/$@.f90; # List dependencies for each example. Normally, automake would take diff --git a/hl/c++/examples/Makefile.am b/hl/c++/examples/Makefile.am index 85cb35e..7142e8f 100644 --- a/hl/c++/examples/Makefile.am +++ b/hl/c++/examples/Makefile.am @@ -34,7 +34,7 @@ HDF_CXX=yes EXAMPLEDIR=$(docdir)/hdf5/examples/hl/c++ # How to build programs using h5c++ -$(EXTRA_PROG): $(LIBHDF5) $(LIBH5CPP) $(LIBH5CPP_HL) +$(EXTRA_PROG): $(H5CPP) $(H5CPP) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp # List dependencies for each program. Normally, automake would take diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index af034d7..13c5f22 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -522,7 +522,7 @@ uninstall-am: uninstall-info-am uninstall-local install-doc lib progs tests uninstall-doc _exec_check-s _test # How to build programs using h5c++ -$(EXTRA_PROG): $(LIBHDF5) $(LIBH5CPP) $(LIBH5CPP_HL) +$(EXTRA_PROG): $(H5CPP) $(H5CPP) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp # List dependencies for each program. Normally, automake would take diff --git a/hl/examples/Makefile.am b/hl/examples/Makefile.am index a98e4a5..df3a8ad 100644 --- a/hl/examples/Makefile.am +++ b/hl/examples/Makefile.am @@ -43,10 +43,11 @@ TEST_PROG = ex_lite1 ex_lite2 ex_lite3 ptExampleFL ptExampleVL \ INSTALL_FILES = ptExampleFL.c ptExampleVL.c # Additional dependencies for each program are listed below. -$(EXTRA_PROG): $(LIBHDF5) $(LIBH5_HL) if BUILD_PARALLEL_CONDITIONAL +$(EXTRA_PROG): $(H5CC_PP) $(H5CC_PP) $(CFLAGS) -o $@ $(srcdir)/$@.c; else +$(EXTRA_PROG): $(H5CC) $(H5CC) $(CFLAGS) -o $@ $(srcdir)/$@.c; endif diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 3fae85b..f61ceae 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -529,8 +529,9 @@ uninstall-am: uninstall-info-am uninstall-local install-doc lib progs tests uninstall-doc _exec_check-s _test # Additional dependencies for each program are listed below. -$(EXTRA_PROG): $(LIBHDF5) $(LIBH5_HL) +@BUILD_PARALLEL_CONDITIONAL_TRUE@$(EXTRA_PROG): $(H5CC_PP) @BUILD_PARALLEL_CONDITIONAL_TRUE@ $(H5CC_PP) $(CFLAGS) -o $@ $(srcdir)/$@.c; +@BUILD_PARALLEL_CONDITIONAL_FALSE@$(EXTRA_PROG): $(H5CC) @BUILD_PARALLEL_CONDITIONAL_FALSE@ $(H5CC) $(CFLAGS) -o $@ $(srcdir)/$@.c; # ex_lite2 uses a file created by ex_lite1 diff --git a/hl/fortran/examples/Makefile.am b/hl/fortran/examples/Makefile.am index 9ed304f..def2fdc 100644 --- a/hl/fortran/examples/Makefile.am +++ b/hl/fortran/examples/Makefile.am @@ -39,11 +39,11 @@ INSTALL_FILES= HDF_FORTRAN=yes # Tell automake how to build examples using h5fc -# Additional dependencies for the examples are listed below -$(EXTRA_PROG): $(LIBHDF5) $(LIBH5F) $(LIBH5F_HL) if BUILD_PARALLEL_CONDITIONAL +$(EXTRA_PROG): $(H5FC_PP) $(H5FC_PP) $(FCFLAGS) -o $@ $(srcdir)/$@.f90; else +$(EXTRA_PROG): $(H5FC) $(H5FC) $(FCFLAGS) -o $@ $(srcdir)/$@.f90; endif diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index f2c754a..ffbe43b 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -528,9 +528,9 @@ uninstall-am: uninstall-info-am uninstall-local install-doc lib progs tests uninstall-doc _exec_check-s _test # Tell automake how to build examples using h5fc -# Additional dependencies for the examples are listed below -$(EXTRA_PROG): $(LIBHDF5) $(LIBH5F) $(LIBH5F_HL) +@BUILD_PARALLEL_CONDITIONAL_TRUE@$(EXTRA_PROG): $(H5FC_PP) @BUILD_PARALLEL_CONDITIONAL_TRUE@ $(H5FC_PP) $(FCFLAGS) -o $@ $(srcdir)/$@.f90; +@BUILD_PARALLEL_CONDITIONAL_FALSE@$(EXTRA_PROG): $(H5FC) @BUILD_PARALLEL_CONDITIONAL_FALSE@ $(H5FC) $(FCFLAGS) -o $@ $(srcdir)/$@.f90; # How to create EXAMPLEDIR if it doesn't already exist |