summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlrknox <lrknox>2017-04-28 21:37:22 (GMT)
committerlrknox <lrknox>2017-04-28 21:37:22 (GMT)
commitbe49a9422654ac9eec07ffe3599b4a7f7561cdb6 (patch)
treea367840b3feeb8ee1571079fa5480b3789dc7de4
parentfc4e8ea5ecc52d0df179ec26ec9bf001a60c1ca0 (diff)
downloadhdf5-be49a9422654ac9eec07ffe3599b4a7f7561cdb6.zip
hdf5-be49a9422654ac9eec07ffe3599b4a7f7561cdb6.tar.gz
hdf5-be49a9422654ac9eec07ffe3599b4a7f7561cdb6.tar.bz2
Comment out install-exec-hooks to remove libdynlib* files. Allen did
the same for hdf5_1_10 and hdf5_1_10_1 because the hooks don't reliably work. In the develop branch they are causing make install failures because the autotools' install commands sometimes attempt to chmod these files when they no longer exist.
-rw-r--r--test/Makefile.am4
-rw-r--r--tools/test/h5diff/Makefile.am4
-rw-r--r--tools/test/h5dump/Makefile.am4
-rw-r--r--tools/test/h5ls/Makefile.am4
-rw-r--r--tools/test/h5repack/Makefile.am4
5 files changed, 10 insertions, 10 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index b274302..20b63f6 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -126,8 +126,8 @@ libdynlib3.la: $(libdynlib3_la_OBJECTS) $(libdynlib3_la_DEPENDENCIES) $(EXTRA_li
libdynlib4.la: $(libdynlib4_la_OBJECTS) $(libdynlib4_la_DEPENDENCIES) $(EXTRA_libdynlib4_la_DEPENDENCIES)
$(AM_V_CCLD)$(libdynlib4_la_LINK) $(am_libdynlib4_la_rpath) $(libdynlib4_la_OBJECTS) $(libdynlib4_la_LIBADD)
-install-exec-hook:
- $(RM) $(DESTDIR)$(dyndir)/*dynlib*
+#install-exec-hook:
+# $(RM) $(DESTDIR)$(dyndir)/*dynlib*
endif
libh5test_la_SOURCES=h5test.c testframe.c cache_common.c swmr_common.c
diff --git a/tools/test/h5diff/Makefile.am b/tools/test/h5diff/Makefile.am
index 922dddc..5721aaa 100644
--- a/tools/test/h5diff/Makefile.am
+++ b/tools/test/h5diff/Makefile.am
@@ -57,8 +57,8 @@ if HAVE_SHARED_CONDITIONAL
libdynlibdiff.la: $(libdynlibdiff_la_OBJECTS) $(libdynlibdiff_la_DEPENDENCIES) $(EXTRA_libdynlibdiff_la_DEPENDENCIES)
$(AM_V_CCLD)$(libdynlibdiff_la_LINK) $(am_libdynlibdiff_la_rpath) $(libdynlibdiff_la_OBJECTS) $(libdynlibdiff_la_LIBADD)
-install-exec-hook:
- $(RM) $(DESTDIR)$(dyndir)/*dynlib*
+#install-exec-hook:
+# $(RM) $(DESTDIR)$(dyndir)/*dynlib*
endif
# Temporary files. *.h5 are generated by h5diff. They should
diff --git a/tools/test/h5dump/Makefile.am b/tools/test/h5dump/Makefile.am
index 64d2d7c..df97396 100644
--- a/tools/test/h5dump/Makefile.am
+++ b/tools/test/h5dump/Makefile.am
@@ -46,8 +46,8 @@ if HAVE_SHARED_CONDITIONAL
libdynlibdump.la: $(libdynlibdump_la_OBJECTS) $(libdynlibdump_la_DEPENDENCIES) $(EXTRA_libdynlibdump_la_DEPENDENCIES)
$(AM_V_CCLD)$(libdynlibdump_la_LINK) $(am_libdynlibdump_la_rpath) $(libdynlibdump_la_OBJECTS) $(libdynlibdump_la_LIBADD)
-install-exec-hook:
- $(RM) $(DESTDIR)$(dyndir)/*dynlib*
+#install-exec-hook:
+# $(RM) $(DESTDIR)$(dyndir)/*dynlib*
endif
# Temporary files. *.h5 are generated by h5dumpgentest. They should
diff --git a/tools/test/h5ls/Makefile.am b/tools/test/h5ls/Makefile.am
index 9773ee5..8ace14d 100644
--- a/tools/test/h5ls/Makefile.am
+++ b/tools/test/h5ls/Makefile.am
@@ -43,8 +43,8 @@ if HAVE_SHARED_CONDITIONAL
libdynlibls.la: $(libdynlibls_la_OBJECTS) $(libdynlibls_la_DEPENDENCIES) $(EXTRA_libdynlibls_la_DEPENDENCIES)
$(AM_V_CCLD)$(libdynlibls_la_LINK) $(am_libdynlibls_la_rpath) $(libdynlibls_la_OBJECTS) $(libdynlibls_la_LIBADD)
-install-exec-hook:
- $(RM) $(DESTDIR)$(dyndir)/*dynlib*
+#install-exec-hook:
+# $(RM) $(DESTDIR)$(dyndir)/*dynlib*
endif
diff --git a/tools/test/h5repack/Makefile.am b/tools/test/h5repack/Makefile.am
index b3cfc88..da2a3c3 100644
--- a/tools/test/h5repack/Makefile.am
+++ b/tools/test/h5repack/Makefile.am
@@ -56,8 +56,8 @@ libdynlibadd.la: $(libdynlibadd_la_OBJECTS) $(libdynlibadd_la_DEPENDENCIES) $(EX
libdynlibvers.la: $(libdynlibvers_la_OBJECTS) $(libdynlibvers_la_DEPENDENCIES) $(EXTRA_libdynlibvers_la_DEPENDENCIES)
$(AM_V_CCLD)$(libdynlibvers_la_LINK) $(am_libdynlibvers_la_rpath) $(libdynlibvers_la_OBJECTS) $(libdynlibvers_la_LIBADD)
-install-exec-hook:
- $(RM) $(DESTDIR)$(dyndir)/*dynlib*
+#install-exec-hook:
+# $(RM) $(DESTDIR)$(dyndir)/*dynlib*
endif