From 8ed95c00114dd3f6d9b766664c3bb56aa75f7a4f Mon Sep 17 00:00:00 2001 From: James Laird Date: Wed, 16 Feb 2005 14:27:27 -0500 Subject: [svn-r10016] Purpose: Bug fix Description: modi4 dies during build with strange errors. The root cause of these is a two-year-old hack in HDF5's libtool script that only takes effect on IRIX. Solution: Edited the libtool hack (by editing ltmain.sh) to correct a bug in the hack. Also made sure that compiler-specific DEFAULT_LIBS are used when linking. Platforms tested: sleipnir, copper, modi4, sol --- Makefile.in | 1 - bin/ltmain.sh | 3 +++ c++/Makefile.in | 1 - c++/examples/Makefile.in | 1 - c++/src/Makefile.in | 1 - c++/test/Makefile.in | 1 - configure | 7 ++++--- configure.in | 7 ++++++- doc/Makefile.in | 1 - doc/html/ADGuide/Makefile.in | 1 - doc/html/Graphics/Makefile.in | 1 - doc/html/Intro/Makefile.in | 1 - doc/html/Makefile.in | 1 - doc/html/PSandPDF/Makefile.in | 1 - doc/html/TechNotes/Makefile.in | 1 - doc/html/Tutor/Graphics/Makefile.in | 1 - doc/html/Tutor/Makefile.in | 1 - doc/html/Tutor/examples/Makefile.in | 1 - doc/html/cpplus/Makefile.in | 1 - doc/html/ed_libs/Makefile.in | 1 - doc/html/ed_styles/Makefile.in | 1 - doc/html/fortran/Makefile.in | 1 - examples/Makefile.in | 1 - fortran/Makefile.in | 1 - fortran/examples/Makefile.in | 1 - fortran/src/Makefile.in | 1 - fortran/test/Makefile.in | 1 - fortran/testpar/Makefile.in | 1 - hl/Makefile.in | 1 - hl/fortran/Makefile.in | 1 - hl/fortran/src/Makefile.in | 1 - hl/fortran/test/Makefile.in | 1 - hl/src/Makefile.in | 1 - hl/test/Makefile.in | 1 - hl/tools/gif2h5/Makefile.in | 1 - perform/Makefile.in | 1 - src/Makefile.in | 1 - test/Makefile.in | 1 - testpar/Makefile.in | 1 - tools/Makefile.in | 1 - tools/gifconv/Makefile.in | 1 - tools/h5diff/Makefile.in | 1 - tools/h5dump/Makefile.in | 1 - tools/h5import/Makefile.in | 1 - tools/h5jam/Makefile.in | 1 - tools/h5ls/Makefile.in | 1 - tools/h5repack/Makefile.in | 1 - tools/lib/Makefile.in | 1 - tools/misc/Makefile.in | 1 - 49 files changed, 13 insertions(+), 50 deletions(-) diff --git a/Makefile.in b/Makefile.in index b8c55b9..0678406 100644 --- a/Makefile.in +++ b/Makefile.in @@ -106,7 +106,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/bin/ltmain.sh b/bin/ltmain.sh index 92113ca..ef07484 100644 --- a/bin/ltmain.sh +++ b/bin/ltmain.sh @@ -3225,6 +3225,9 @@ EOF # of library paths finalize_rpath=`echo $rpath | sed -e "s#:# ${wl}-rpath ${wl}#g"`; compile_rpath=`echo $rpath | sed -e "s#:# ${wl}-rpath ${wl}#g"`; + # Add a space before each path + finalize_rpath=" $finalize_rpath" + compile_rpath=" $compile_rpath" ;; *) finalize_rpath="$rpath"; diff --git a/c++/Makefile.in b/c++/Makefile.in index eac374e..8bdb306 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index f7bd9b1..2260197 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 0d7f370..06d3516 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index f1d8a3d..7339ece 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/configure b/configure index d00617d..187133c 100755 --- a/configure +++ b/configure @@ -472,7 +472,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS DEFAULT_LIBS HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE HDF5_INTERFACES R_LARGE R_INTEGER HADDR_T HSIZE_T HSSIZE_T HID_T SIZE_T OBJECT_NAMELEN_DEFAULT_F FFLAGS F9XSUFFIXFLAG FSEARCH_DIRS F9X F9XMODFLAG F9XMODEXT FC F77 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP LT_STATIC_EXEC PERL AR LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL AM_MAKEFLAGS USE_FILTER_DEFLATE USE_FILTER_SZIP SSL GASS TESTGASS SRB TESTSRB BUILD_PDB2HDF BUILD_PDB2HDF_CONDITIONAL_TRUE BUILD_PDB2HDF_CONDITIONAL_FALSE PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL ADD_PARALLEL_FILES MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 USE_FILTER_NBIT H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL HL_FOR BUILD_CXX_CONDITIONAL_TRUE BUILD_CXX_CONDITIONAL_FALSE BUILD_PABLO_CONDITIONAL_TRUE BUILD_PABLO_CONDITIONAL_FALSE BUILD_PARALLEL_CONDITIONAL_TRUE BUILD_PARALLEL_CONDITIONAL_FALSE BUILD_FORTRAN_CONDITIONAL_TRUE BUILD_FORTRAN_CONDITIONAL_FALSE BUILD_HDF5_HL_CONDITIONAL_TRUE BUILD_HDF5_HL_CONDITIONAL_FALSE SEARCH SETX LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE HDF5_INTERFACES R_LARGE R_INTEGER HADDR_T HSIZE_T HSSIZE_T HID_T SIZE_T OBJECT_NAMELEN_DEFAULT_F FFLAGS F9XSUFFIXFLAG FSEARCH_DIRS F9X F9XMODFLAG F9XMODEXT FC F77 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP LT_STATIC_EXEC PERL AR LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL AM_MAKEFLAGS USE_FILTER_DEFLATE USE_FILTER_SZIP SSL GASS TESTGASS SRB TESTSRB BUILD_PDB2HDF BUILD_PDB2HDF_CONDITIONAL_TRUE BUILD_PDB2HDF_CONDITIONAL_FALSE PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL ADD_PARALLEL_FILES MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 USE_FILTER_NBIT H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL HL_FOR BUILD_CXX_CONDITIONAL_TRUE BUILD_CXX_CONDITIONAL_FALSE BUILD_PABLO_CONDITIONAL_TRUE BUILD_PABLO_CONDITIONAL_FALSE BUILD_PARALLEL_CONDITIONAL_TRUE BUILD_PARALLEL_CONDITIONAL_FALSE BUILD_FORTRAN_CONDITIONAL_TRUE BUILD_FORTRAN_CONDITIONAL_FALSE BUILD_HDF5_HL_CONDITIONAL_TRUE BUILD_HDF5_HL_CONDITIONAL_FALSE SEARCH SETX LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -2031,7 +2031,7 @@ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - DEFAULT_LIBS="" +DEFAULT_LIBS="" @@ -39498,6 +39498,8 @@ else fi ROOT="`$pwd`" +LIBS="$DEFAULT_LIBS $LIBS" + DYNAMIC_DIRS="" if test -n "$LDFLAGS"; then @@ -40405,7 +40407,6 @@ s,@host_cpu@,$host_cpu,;t t s,@host_vendor@,$host_vendor,;t t s,@host_os@,$host_os,;t t s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@DEFAULT_LIBS@,$DEFAULT_LIBS,;t t s,@HSIZET@,$HSIZET,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t diff --git a/configure.in b/configure.in index 296c955..d4dbf41 100644 --- a/configure.in +++ b/configure.in @@ -65,7 +65,7 @@ dnl Different compilers may need default libraries. They are specified in dnl the config/* files, so we put this statement here so that it'll be dnl set by the code which follows... dnl -AC_SUBST(DEFAULT_LIBS) DEFAULT_LIBS="" +DEFAULT_LIBS="" dnl ---------------------------------------------------------------------- dnl Set prefix default (install directory) to a directory in the build area. @@ -2895,6 +2895,11 @@ fi AC_SUBST([ROOT]) ROOT="`$pwd`" dnl ---------------------------------------------------------------------- +dnl Move any compiler-specific libraries into the main LIBS varaible. +dnl +LIBS="$DEFAULT_LIBS $LIBS" + +dnl ---------------------------------------------------------------------- dnl Determine the runtime libraries we may need to include in the dnl libtools command so that executables will find the correct dynamic dnl libraries. diff --git a/doc/Makefile.in b/doc/Makefile.in index ee156e8..3a87869 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/doc/html/ADGuide/Makefile.in b/doc/html/ADGuide/Makefile.in index 273fba7..433cab4 100644 --- a/doc/html/ADGuide/Makefile.in +++ b/doc/html/ADGuide/Makefile.in @@ -95,7 +95,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/doc/html/Graphics/Makefile.in b/doc/html/Graphics/Makefile.in index 3da3245..844678f 100644 --- a/doc/html/Graphics/Makefile.in +++ b/doc/html/Graphics/Makefile.in @@ -95,7 +95,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/doc/html/Intro/Makefile.in b/doc/html/Intro/Makefile.in index 7c18fe5..4459919 100644 --- a/doc/html/Intro/Makefile.in +++ b/doc/html/Intro/Makefile.in @@ -95,7 +95,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in index f81b9a7..d43c53d 100644 --- a/doc/html/Makefile.in +++ b/doc/html/Makefile.in @@ -99,7 +99,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/doc/html/PSandPDF/Makefile.in b/doc/html/PSandPDF/Makefile.in index 4234eb8..85f2c87 100644 --- a/doc/html/PSandPDF/Makefile.in +++ b/doc/html/PSandPDF/Makefile.in @@ -95,7 +95,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/doc/html/TechNotes/Makefile.in b/doc/html/TechNotes/Makefile.in index 85b388f..08b47ab 100644 --- a/doc/html/TechNotes/Makefile.in +++ b/doc/html/TechNotes/Makefile.in @@ -95,7 +95,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/doc/html/Tutor/Graphics/Makefile.in b/doc/html/Tutor/Graphics/Makefile.in index 750ba64..4936921 100644 --- a/doc/html/Tutor/Graphics/Makefile.in +++ b/doc/html/Tutor/Graphics/Makefile.in @@ -95,7 +95,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/doc/html/Tutor/Makefile.in b/doc/html/Tutor/Makefile.in index 33fe961..556ca95 100644 --- a/doc/html/Tutor/Makefile.in +++ b/doc/html/Tutor/Makefile.in @@ -95,7 +95,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/doc/html/Tutor/examples/Makefile.in b/doc/html/Tutor/examples/Makefile.in index 4abb0d8..c0f63f1 100644 --- a/doc/html/Tutor/examples/Makefile.in +++ b/doc/html/Tutor/examples/Makefile.in @@ -95,7 +95,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/doc/html/cpplus/Makefile.in b/doc/html/cpplus/Makefile.in index d1fc082..3b906b5 100644 --- a/doc/html/cpplus/Makefile.in +++ b/doc/html/cpplus/Makefile.in @@ -95,7 +95,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/doc/html/ed_libs/Makefile.in b/doc/html/ed_libs/Makefile.in index 9706f61..aa5078b 100644 --- a/doc/html/ed_libs/Makefile.in +++ b/doc/html/ed_libs/Makefile.in @@ -95,7 +95,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/doc/html/ed_styles/Makefile.in b/doc/html/ed_styles/Makefile.in index 4d98970..90614e2 100644 --- a/doc/html/ed_styles/Makefile.in +++ b/doc/html/ed_styles/Makefile.in @@ -95,7 +95,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/doc/html/fortran/Makefile.in b/doc/html/fortran/Makefile.in index 91048db..52ae927 100644 --- a/doc/html/fortran/Makefile.in +++ b/doc/html/fortran/Makefile.in @@ -95,7 +95,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/examples/Makefile.in b/examples/Makefile.in index ebe662a..f948062 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/fortran/Makefile.in b/fortran/Makefile.in index a4c6512..313d84a 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -107,7 +107,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 4ed6e72..3b62f8f 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 65e67d6..3d3b20c 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 2f8b2a7..8b65e62 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index a6ce70f..a9c616e 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/Makefile.in b/hl/Makefile.in index 8289ee6..68d55aa 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -98,7 +98,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index da719b0..02b1936 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -98,7 +98,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 5cf0c26..451e8fe 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -94,7 +94,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index d807cb4..421f257 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -94,7 +94,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index bed13c8..fef0e90 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -93,7 +93,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 75bf017..497fda1 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -95,7 +95,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index f14d0f4..c618ad4 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/perform/Makefile.in b/perform/Makefile.in index ade9a3c..78d003a 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/src/Makefile.in b/src/Makefile.in index 507bc22..e3eae70 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/test/Makefile.in b/test/Makefile.in index 1535fa8..5a4620c 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/testpar/Makefile.in b/testpar/Makefile.in index deef59a..3b6b312 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/Makefile.in b/tools/Makefile.in index c94ffc5..7f3a600 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in index f14d0f4..c618ad4 100644 --- a/tools/gifconv/Makefile.in +++ b/tools/gifconv/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index c9247dd..e834638 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index a6c0a20..7bbef8e 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 2846485..d50ce38 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 1ef2a36..228a0a1 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -87,7 +87,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index cfa8334..08184b9 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index bed3041..f1cf57c 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 5a7276e..7e8e446 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index a2922f8..60ce203 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -103,7 +103,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ DEBUG_PKG = @DEBUG_PKG@ -DEFAULT_LIBS = @DEFAULT_LIBS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ -- cgit v0.12