diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-07-18 23:30:38 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-07-18 23:30:38 (GMT) |
| commit | d2e92fd23610c3ccdddbbc55484e54a5a21a9252 (patch) | |
| tree | 462898f15d85477e218439ce4719dc42beb19c5e /examples | |
| parent | cd5ca85fb7c98154224628d7ef21e179bf653ff5 (diff) | |
| download | hdf5-d2e92fd23610c3ccdddbbc55484e54a5a21a9252.zip hdf5-d2e92fd23610c3ccdddbbc55484e54a5a21a9252.tar.gz hdf5-d2e92fd23610c3ccdddbbc55484e54a5a21a9252.tar.bz2 | |
[svn-r11083] Purpose:
Bug fixes
Description:
A number of minor changes to Makefiles. Some files will now be cleaned
properly, some comments are more informative, etc.
Platforms tested:
heping, mir, modi4
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Makefile.am | 7 | ||||
| -rw-r--r-- | examples/Makefile.in | 11 |
2 files changed, 8 insertions, 10 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index 07f659b..1e4b883 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -22,8 +22,6 @@ include $(top_srcdir)/config/commence.am if BUILD_PARALLEL_CONDITIONAL TEST_PROG_PARA = ph5example -else - TEST_PROG_PARA = endif # Example programs. @@ -47,7 +45,8 @@ INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c \ h5_reference.c h5_drivers.c ph5example.c # We need to tell automake what to clean -CLEANFILES=*.h5 *.raw *.meta *.clog $(TEST_PROG) ph5example *.o +MOSTLYCLEANFILES+=*.h5 *.raw *.meta *.clog *.o +CLEANFILES=$(TEST_PROG) $(TEST_PROG_PARA) # Additional dependencies for each program are listed below. $(EXTRA_PROG): $(LIBHDF5) @@ -86,7 +85,7 @@ install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) uninstall-examples: @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \ - set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES).c; \ + set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES); \ fi check-install: diff --git a/examples/Makefile.in b/examples/Makefile.in index a8d6fcf..ee73209 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -273,8 +273,9 @@ H5FC = $(bindir)/h5fc H5FC_PP = $(bindir)/h5pfc # .chkexe and .chksh files are used to mark tests that have run successfully. -MOSTLYCLEANFILES = *.chkexe *.chksh -@BUILD_PARALLEL_CONDITIONAL_FALSE@TEST_PROG_PARA = + +# We need to tell automake what to clean +MOSTLYCLEANFILES = *.chkexe *.chksh *.h5 *.raw *.meta *.clog *.o @BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = ph5example # Example programs. @@ -298,9 +299,7 @@ INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c \ h5_compound.c h5_group.c h5_select.c h5_attribute.c h5_mount.c \ h5_reference.c h5_drivers.c ph5example.c - -# We need to tell automake what to clean -CLEANFILES = *.h5 *.raw *.meta *.clog $(TEST_PROG) ph5example *.o +CLEANFILES = $(TEST_PROG) $(TEST_PROG_PARA) # How to install examples # There are a lot of rules because automake does not know about @@ -518,7 +517,7 @@ install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) uninstall-examples: @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \ - set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES).c; \ + set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES); \ fi check-install: |