71 lines
3.7 KiB
Diff
71 lines
3.7 KiB
Diff
diff -up hdf5-1.8.13/src/Makefile.am.LD_LIBRARY_PATH hdf5-1.8.13/src/Makefile.am
|
|
--- hdf5-1.8.13/src/Makefile.am.LD_LIBRARY_PATH 2014-05-05 20:13:01.000000000 -0600
|
|
+++ hdf5-1.8.13/src/Makefile.am 2014-05-15 09:53:59.569476295 -0600
|
|
@@ -128,8 +128,6 @@ settings_DATA=libhdf5.settings
|
|
# Remove the generated .c file if errors occur unless HDF5_Make_Ignore
|
|
# is set to ignore the error.
|
|
H5Tinit.c: H5detect$(EXEEXT)
|
|
- LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \
|
|
- sed -e 's/-L/:/g' -e 's/ //g'`" \
|
|
$(RUNSERIAL) ./H5detect$(EXEEXT) > $@ || \
|
|
(test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
|
|
($(RM) $@ ; exit 1)
|
|
@@ -140,8 +138,6 @@ H5Tinit.c: H5detect$(EXEEXT)
|
|
# Remove the generated .c file if errors occur unless HDF5_Make_Ignore
|
|
# is set to ignore the error.
|
|
H5lib_settings.c: H5make_libsettings$(EXEEXT) libhdf5.settings
|
|
- LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \
|
|
- sed -e 's/-L/:/g' -e 's/ //g'`" \
|
|
$(RUNSERIAL) ./H5make_libsettings$(EXEEXT) > $@ || \
|
|
(test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
|
|
($(RM) $@ ; exit 1)
|
|
diff -up hdf5-1.8.13/src/Makefile.in.LD_LIBRARY_PATH hdf5-1.8.13/src/Makefile.in
|
|
--- hdf5-1.8.13/src/Makefile.in.LD_LIBRARY_PATH 2014-05-05 20:15:48.000000000 -0600
|
|
+++ hdf5-1.8.13/src/Makefile.in 2014-05-15 09:44:15.622418784 -0600
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
|
@@ -109,7 +109,10 @@ noinst_PROGRAMS = H5detect$(EXEEXT) H5ma
|
|
TESTS =
|
|
subdir = src
|
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
|
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
|
|
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
|
|
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
|
|
+ $(top_srcdir)/configure.ac
|
|
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
|
$(ACLOCAL_M4)
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
|
|
@@ -883,8 +886,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
|
|
$(am__aclocal_m4_deps):
|
|
|
|
H5config.h: stamp-h1
|
|
- @test -f $@ || rm -f stamp-h1
|
|
- @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
|
|
+ @if test ! -f $@; then rm -f stamp-h1; else :; fi
|
|
+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
|
|
|
|
stamp-h1: $(srcdir)/H5config.h.in $(top_builddir)/config.status
|
|
@rm -f stamp-h1
|
|
@@ -1207,14 +1210,14 @@ distclean-compile:
|
|
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
|
|
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
|
|
|
|
.c.obj:
|
|
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
|
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
|
|
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
|
.c.lo:
|
|
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|