summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MANIFEST3
-rw-r--r--hl/examples/Makefile.am12
-rw-r--r--hl/examples/Makefile.in14
-rw-r--r--src/Makefile.in44
4 files changed, 44 insertions, 29 deletions
diff --git a/MANIFEST b/MANIFEST
index d4bbba0..8426ac6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1258,6 +1258,9 @@
# high level libraries
./hl/Makefile.am
./hl/Makefile.in
+./hl/examples/ex_lite1.c
+./hl/examples/ex_lite2.c
+./hl/examples/ex_lite3.c
./hl/examples/Makefile.am
./hl/examples/Makefile.in
./hl/examples/ptExampleFL.c
diff --git a/hl/examples/Makefile.am b/hl/examples/Makefile.am
index 6a436af..eb55293 100644
--- a/hl/examples/Makefile.am
+++ b/hl/examples/Makefile.am
@@ -24,11 +24,14 @@ if BUILD_PARALLEL_CONDITIONAL
TEST_PROG_PARA =
endif
+# Example directory
+EXAMPLEDIR=$(docdir)/hdf5/examples/hl/c
+
# Example programs.
# Don't tell automake about them, because if it knew they were programs,
# it would try to compile them instead of using the h5cc script.
# Use the boilerplate in config/examples.am instead.
-TEST_PROG = ptExampleFL ptExampleVL
+TEST_PROG = ex_lite1 ex_lite2 ex_lite3 ptExampleFL ptExampleVL
# Install files
# List all file that should be installed in examples directory
@@ -42,8 +45,8 @@ else
$(H5CC) $(CFLAGS) -o $@ $(srcdir)/$@.c;
endif
-# Example directory
-EXAMPLEDIR=$(docdir)/hdf5/examples/hl/c
+# ex_lite2 uses a file created by ex_lite1
+ex_lite2.chkexe_: ex_lite1.chkexe_
# List dependencies for each program. Normally, automake would take
# care of this for us, but if we tell automake about the programs it
@@ -51,6 +54,9 @@ EXAMPLEDIR=$(docdir)/hdf5/examples/hl/c
# an inelegant way of solving the problem.
# All programs share the same build rule and a dependency on the main hdf5
# library above.
+ex_lite1: $(srcdir)/ex_lite1.c
+ex_lite2: $(srcdir)/ex_lite2.c
+ex_lite3: $(srcdir)/ex_lite3.c
ptExampleFL: $(srcdir)/ptExampleFL.c
ptExampleVL: $(srcdir)/ptExampleVL.c
diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in
index a97b677..3ed927f 100644
--- a/hl/examples/Makefile.in
+++ b/hl/examples/Makefile.in
@@ -309,19 +309,19 @@ TRACE = perl $(top_srcdir)/bin/trace
CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
@BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA =
+# Example directory
+EXAMPLEDIR = $(docdir)/hdf5/examples/hl/c
+
# Example programs.
# Don't tell automake about them, because if it knew they were programs,
# it would try to compile them instead of using the h5cc script.
# Use the boilerplate in config/examples.am instead.
-TEST_PROG = ptExampleFL ptExampleVL
+TEST_PROG = ex_lite1 ex_lite2 ex_lite3 ptExampleFL ptExampleVL
# Install files
# List all file that should be installed in examples directory
INSTALL_FILES = ptExampleFL.c ptExampleVL.c
-# Example directory
-EXAMPLEDIR = $(docdir)/hdf5/examples/hl/c
-
# Assume that all tests in this directory are examples, and tell
# conclude.am when to build them.
EXAMPLE_PROG = $(TEST_PROG_PARA) $(TEST_PROG)
@@ -534,12 +534,18 @@ $(EXTRA_PROG): $(LIBHDF5) $(LIBH5_HL)
@BUILD_PARALLEL_CONDITIONAL_TRUE@ $(H5CC_PP) $(CFLAGS) -o $@ $(srcdir)/$@.c;
@BUILD_PARALLEL_CONDITIONAL_FALSE@ $(H5CC) $(CFLAGS) -o $@ $(srcdir)/$@.c;
+# ex_lite2 uses a file created by ex_lite1
+ex_lite2.chkexe_: ex_lite1.chkexe_
+
# List dependencies for each program. Normally, automake would take
# care of this for us, but if we tell automake about the programs it
# will try to build them with the normal C compiler, not h5cc. This is
# an inelegant way of solving the problem.
# All programs share the same build rule and a dependency on the main hdf5
# library above.
+ex_lite1: $(srcdir)/ex_lite1.c
+ex_lite2: $(srcdir)/ex_lite2.c
+ex_lite3: $(srcdir)/ex_lite3.c
ptExampleFL: $(srcdir)/ptExampleFL.c
ptExampleVL: $(srcdir)/ptExampleVL.c
diff --git a/src/Makefile.in b/src/Makefile.in
index dd8ec8b..b7914e1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -83,31 +83,31 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libhdf5_la_LIBADD =
am_libhdf5_la_OBJECTS = H5.lo H5A.lo H5AC.lo H5B.lo H5Bcache.lo \
- H5B2.lo H5B2cache.lo H5B2dbg.lo H5B2int.lo H5B2test.lo H5C.lo H5D.lo \
- H5Dcompact.lo H5Dcontig.lo H5Defl.lo H5Dio.lo H5Distore.lo \
- H5Dmpio.lo H5Doh.lo H5Dselect.lo H5Dtest.lo H5E.lo H5F.lo \
- H5Fdbg.lo H5Fmount.lo H5Fsfile.lo H5Fsuper.lo H5FD.lo \
- H5FDcore.lo H5FDfamily.lo H5FDfphdf5.lo H5FDlog.lo H5FDmpi.lo \
- H5FDmpio.lo H5FDmpiposix.lo H5FDmulti.lo H5FDsec2.lo \
- H5FDstdio.lo H5FDstream.lo H5FL.lo H5FO.lo H5FP.lo \
+ H5B2.lo H5B2cache.lo H5B2dbg.lo H5B2int.lo H5B2test.lo H5C.lo \
+ H5D.lo H5Dcompact.lo H5Dcontig.lo H5Defl.lo H5Dio.lo \
+ H5Distore.lo H5Dmpio.lo H5Doh.lo H5Dselect.lo H5Dtest.lo \
+ H5E.lo H5F.lo H5Fdbg.lo H5Fmount.lo H5Fsfile.lo H5Fsuper.lo \
+ H5FD.lo H5FDcore.lo H5FDfamily.lo H5FDfphdf5.lo H5FDlog.lo \
+ H5FDmpi.lo H5FDmpio.lo H5FDmpiposix.lo H5FDmulti.lo \
+ H5FDsec2.lo H5FDstdio.lo H5FDstream.lo H5FL.lo H5FO.lo H5FP.lo \
H5FPclient.lo H5FPserver.lo H5FS.lo H5G.lo H5Gent.lo \
H5Glink.lo H5Gloc.lo H5Gname.lo H5Gnode.lo H5Gobj.lo H5Goh.lo \
H5Gstab.lo H5Gtest.lo H5Gtraverse.lo H5HF.lo H5HFcache.lo \
- H5HFdbg.lo H5HFint.lo H5HFtest.lo H5HG.lo H5HGdbg.lo H5HL.lo H5HLdbg.lo \
- H5HP.lo H5I.lo H5MF.lo H5MM.lo H5MP.lo H5MPtest.lo H5O.lo \
- H5Oattr.lo H5Obogus.lo H5Ocache.lo H5Ocont.lo H5Odtype.lo \
- H5Oefl.lo H5Ofill.lo H5Oginfo.lo H5Olayout.lo H5Olinfo.lo \
- H5Olink.lo H5Omtime.lo H5Oname.lo H5Onull.lo H5Opline.lo \
- H5Osdspace.lo H5Oshared.lo H5Ostab.lo H5P.lo H5Pacpl.lo \
- H5Pdcpl.lo H5Pdxpl.lo H5Pfapl.lo H5Pfcpl.lo H5Pgcpl.lo \
- H5Pocpl.lo H5Ptest.lo H5R.lo H5RC.lo H5RS.lo H5S.lo H5Sall.lo \
- H5Shyper.lo H5Smpio.lo H5Snone.lo H5Spoint.lo H5Sselect.lo \
- H5Stest.lo H5SL.lo H5ST.lo H5T.lo H5Tarray.lo H5Tbit.lo \
- H5Tcommit.lo H5Tcompound.lo H5Tconv.lo H5Tcset.lo H5Tenum.lo \
- H5Tfields.lo H5Tfixed.lo H5Tfloat.lo H5Tinit.lo H5Tnative.lo \
- H5Toffset.lo H5Toh.lo H5Topaque.lo H5Torder.lo H5Tpad.lo \
- H5Tprecis.lo H5Tstrpad.lo H5Tvlen.lo H5TS.lo H5V.lo H5Z.lo \
- H5Zdeflate.lo H5Zfletcher32.lo H5Znbit.lo H5Zshuffle.lo \
+ H5HFdbg.lo H5HFint.lo H5HFtest.lo H5HG.lo H5HGdbg.lo H5HL.lo \
+ H5HLdbg.lo H5HP.lo H5I.lo H5MF.lo H5MM.lo H5MP.lo H5MPtest.lo \
+ H5O.lo H5Oattr.lo H5Obogus.lo H5Ocache.lo H5Ocont.lo \
+ H5Odtype.lo H5Oefl.lo H5Ofill.lo H5Oginfo.lo H5Olayout.lo \
+ H5Olinfo.lo H5Olink.lo H5Omtime.lo H5Oname.lo H5Onull.lo \
+ H5Opline.lo H5Osdspace.lo H5Oshared.lo H5Ostab.lo H5P.lo \
+ H5Pacpl.lo H5Pdcpl.lo H5Pdxpl.lo H5Pfapl.lo H5Pfcpl.lo \
+ H5Pgcpl.lo H5Pocpl.lo H5Ptest.lo H5R.lo H5RC.lo H5RS.lo H5S.lo \
+ H5Sall.lo H5Shyper.lo H5Smpio.lo H5Snone.lo H5Spoint.lo \
+ H5Sselect.lo H5Stest.lo H5SL.lo H5ST.lo H5T.lo H5Tarray.lo \
+ H5Tbit.lo H5Tcommit.lo H5Tcompound.lo H5Tconv.lo H5Tcset.lo \
+ H5Tenum.lo H5Tfields.lo H5Tfixed.lo H5Tfloat.lo H5Tinit.lo \
+ H5Tnative.lo H5Toffset.lo H5Toh.lo H5Topaque.lo H5Torder.lo \
+ H5Tpad.lo H5Tprecis.lo H5Tstrpad.lo H5Tvlen.lo H5TS.lo H5V.lo \
+ H5Z.lo H5Zdeflate.lo H5Zfletcher32.lo H5Znbit.lo H5Zshuffle.lo \
H5Zszip.lo H5Zscaleoffset.lo H5Ztrans.lo
libhdf5_la_OBJECTS = $(am_libhdf5_la_OBJECTS)
PROGRAMS = $(noinst_PROGRAMS)