diff options
author | Mike McGreevy <mamcgree@hdfgroup.org> | 2011-02-03 17:21:20 (GMT) |
---|---|---|
committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2011-02-03 17:21:20 (GMT) |
commit | 31a1d660563fbb40e54492e0577257c374517770 (patch) | |
tree | 60dcc9dafd143bf957a9b52f8b49f1d254ab159c /hl | |
parent | 3a4d80b9d78b36f4549c6ceef8245f93719c15c4 (diff) | |
download | hdf5-31a1d660563fbb40e54492e0577257c374517770.zip hdf5-31a1d660563fbb40e54492e0577257c374517770.tar.gz hdf5-31a1d660563fbb40e54492e0577257c374517770.tar.bz2 |
[svn-r20038] Description:
Remove variable length packet table from Makefiles. This example
has been marked as do not distribute in the MANIFEST, and thus released
tarballs not including the file fail in 'make installcheck'.
Tested:
jam
Diffstat (limited to 'hl')
-rw-r--r-- | hl/c++/examples/Makefile.am | 3 | ||||
-rw-r--r-- | hl/c++/examples/Makefile.in | 3 | ||||
-rw-r--r-- | hl/examples/Makefile.am | 3 | ||||
-rw-r--r-- | hl/examples/Makefile.in | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/hl/c++/examples/Makefile.am b/hl/c++/examples/Makefile.am index f909515..7f806d3 100644 --- a/hl/c++/examples/Makefile.am +++ b/hl/c++/examples/Makefile.am @@ -23,7 +23,7 @@ include $(top_srcdir)/config/commence.am # These are the programs that 'make all' or 'make prog' will build and # which 'make check' will run. List them in the order they should be run. -TEST_PROG=ptExampleFL ptExampleVL +TEST_PROG=ptExampleFL # These are the example files to be installed INSTALL_FILES=ptExampleFL.cpp @@ -45,7 +45,6 @@ $(EXTRA_PROG): $(H5CPP) # will try to build them with the normal C++ compiler, not h5c++. This is # an inelegant way of solving the problem, unfortunately. ptExampleFL: ptExampleFL.cpp -ptExampleVL: ptExampleVL.cpp include $(top_srcdir)/config/examples.am include $(top_srcdir)/config/conclude.am diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 7769511..34b4ea3 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -346,7 +346,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 # These are the programs that 'make all' or 'make prog' will build and # which 'make check' will run. List them in the order they should be run. -TEST_PROG = ptExampleFL ptExampleVL +TEST_PROG = ptExampleFL # These are the example files to be installed INSTALL_FILES = ptExampleFL.cpp @@ -596,7 +596,6 @@ $(EXTRA_PROG): $(H5CPP) # will try to build them with the normal C++ compiler, not h5c++. This is # an inelegant way of solving the problem, unfortunately. ptExampleFL: ptExampleFL.cpp -ptExampleVL: ptExampleVL.cpp # How to create EXAMPLEDIR if it doesn't already exist $(EXAMPLEDIR): diff --git a/hl/examples/Makefile.am b/hl/examples/Makefile.am index 9893fd5..01d0d68 100644 --- a/hl/examples/Makefile.am +++ b/hl/examples/Makefile.am @@ -34,7 +34,7 @@ EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl # 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 = ex_lite1 ex_lite2 ex_lite3 ptExampleFL ptExampleVL \ +TEST_PROG = ex_lite1 ex_lite2 ex_lite3 ptExampleFL \ ex_image1 ex_image2 \ ex_table_01 ex_table_02 ex_table_03 ex_table_04 \ ex_table_05 ex_table_06 ex_table_07 ex_table_08 \ @@ -75,7 +75,6 @@ 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 ex_image1: $(srcdir)/ex_image1.c ex_image2: $(srcdir)/ex_image2.c ex_table01: $(srcdir)/ex_table01.c diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 9dabd36..a43a677 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -354,7 +354,7 @@ EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl # 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 = ex_lite1 ex_lite2 ex_lite3 ptExampleFL ptExampleVL \ +TEST_PROG = ex_lite1 ex_lite2 ex_lite3 ptExampleFL \ ex_image1 ex_image2 \ ex_table_01 ex_table_02 ex_table_03 ex_table_04 \ ex_table_05 ex_table_06 ex_table_07 ex_table_08 \ @@ -621,7 +621,6 @@ 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 ex_image1: $(srcdir)/ex_image1.c ex_image2: $(srcdir)/ex_image2.c ex_table01: $(srcdir)/ex_table01.c |