From 819377eb5b8ba9a02f639f20c1ecc73e114210fb Mon Sep 17 00:00:00 2001 From: hdftest Date: Sat, 27 Jul 2019 13:40:51 -0500 Subject: Missed changes in merge for h5cc move from tools/misc to bin. --- configure | 2 +- configure.ac | 2 +- tools/misc/Makefile.am | 14 +------------- tools/misc/Makefile.in | 32 +++++++++++--------------------- 4 files changed, 14 insertions(+), 36 deletions(-) diff --git a/configure b/configure index 1999d8f..585a533 100755 --- a/configure +++ b/configure @@ -33821,7 +33821,7 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi -chmod 755 tools/misc/h5cc +chmod 755 bin/h5cc if test "X$HDF_CXX" = "Xyes"; then chmod 755 c++/src/h5c++ fi diff --git a/configure.ac b/configure.ac index 94e7c18..12264a4 100644 --- a/configure.ac +++ b/configure.ac @@ -3070,7 +3070,7 @@ AC_CONFIG_FILES([src/libhdf5.settings AC_OUTPUT -chmod 755 tools/misc/h5cc +chmod 755 bin/h5cc if test "X$HDF_CXX" = "Xyes"; then chmod 755 c++/src/h5c++ fi diff --git a/tools/misc/Makefile.am b/tools/misc/Makefile.am index 9e8ee66..5420d28 100644 --- a/tools/misc/Makefile.am +++ b/tools/misc/Makefile.am @@ -48,22 +48,10 @@ h5mkgrp_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) CHECK_CLEANFILES+=*.h5 ../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5 # These were generated by configure. Remove them only when distclean. -DISTCLEANFILES=h5cc testh5repart.sh +DISTCLEANFILES=testh5repart.sh # All programs rely on hdf5 library and h5tools library LDADD=$(LIBH5TOOLS) $(LIBHDF5) -# h5cc needs custom install and uninstall rules, since it may be -# named h5pcc if hdf5 is being built in parallel mode. -if BUILD_PARALLEL_CONDITIONAL - H5CC_NAME=h5pcc -else - H5CC_NAME=h5cc -endif - -install-exec-local: - @$(INSTALL) h5cc $(DESTDIR)$(bindir)/$(H5CC_NAME) -uninstall-local: - @$(RM) $(DESTDIR)$(bindir)/$(H5CC_NAME) include $(top_srcdir)/config/conclude.am diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 053ac2b..5111552 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -701,15 +701,10 @@ h5repart_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) h5mkgrp_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) # These were generated by configure. Remove them only when distclean. -DISTCLEANFILES = h5cc testh5repart.sh +DISTCLEANFILES = testh5repart.sh # All programs rely on hdf5 library and h5tools library LDADD = $(LIBH5TOOLS) $(LIBHDF5) -@BUILD_PARALLEL_CONDITIONAL_FALSE@H5CC_NAME = h5cc - -# h5cc needs custom install and uninstall rules, since it may be -# named h5pcc if hdf5 is being built in parallel mode. -@BUILD_PARALLEL_CONDITIONAL_TRUE@H5CC_NAME = h5pcc # Automake needs to be taught how to build lib, dyn, progs, and tests targets. # These will be filled in automatically for the most part (e.g., @@ -1181,7 +1176,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-binPROGRAMS install-exec-local +install-exec-am: install-binPROGRAMS install-html: install-html-am @@ -1221,7 +1216,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-local +uninstall-am: uninstall-binPROGRAMS .MAKE: check-am install-am install-strip @@ -1232,14 +1227,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-local distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-exec-local install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - mostlyclean-local pdf pdf-am ps ps-am recheck tags tags-am \ - uninstall uninstall-am uninstall-binPROGRAMS uninstall-local + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ + pdf-am ps ps-am recheck tags tags-am uninstall uninstall-am \ + uninstall-binPROGRAMS .PRECIOUS: Makefile @@ -1260,11 +1255,6 @@ help: @BUILD_TESTS_CONDITIONAL_TRUE@ TEST_SCRIPT=testh5repart.sh testh5mkgrp.sh @BUILD_TESTS_CONDITIONAL_FALSE@ TEST_PROG= @BUILD_TESTS_CONDITIONAL_FALSE@ TEST_SCRIPT= - -install-exec-local: - @$(INSTALL) h5cc $(DESTDIR)$(bindir)/$(H5CC_NAME) -uninstall-local: - @$(RM) $(DESTDIR)$(bindir)/$(H5CC_NAME) # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. build-lib: $(LIB) -- cgit v0.12