Changeset 776


Ignore:
Timestamp:
May 19, 2006 4:37:32 PM (13 years ago)
Author:
andreasw
Message:

made setting of libtool flag -no-undefined platform dependent

Location:
trunk/Clp
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.in

    r774 r776  
    158158LN_S = @LN_S@
    159159LTLIBOBJS = @LTLIBOBJS@
     160LT_LDFLAGS = @LT_LDFLAGS@
    160161MAINT = @MAINT@
    161162MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
  • trunk/Clp/configure

    r775 r776  
    474474#endif"
    475475
    476 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 build build_cpu build_vendor build_os ADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE COIN_DEBUG_TRUE COIN_DEBUG_FALSE CDEFS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXXDEFS CXX CXXFLAGS ac_ct_CXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake BUILDTOOLSDIR AUX_DIR HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE MAINTAINER_SMALL_TRUE MAINTAINER_SMALL_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL pkg_lib_dir pkg_include_dir pkg_bin_dir COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE LIBOBJS LTLIBOBJS'
     476ac_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 build build_cpu build_vendor build_os ADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE COIN_DEBUG_TRUE COIN_DEBUG_FALSE CDEFS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXXDEFS CXX CXXFLAGS ac_ct_CXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake BUILDTOOLSDIR AUX_DIR HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE MAINTAINER_SMALL_TRUE MAINTAINER_SMALL_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LT_LDFLAGS pkg_lib_dir pkg_include_dir pkg_bin_dir COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE LIBOBJS LTLIBOBJS'
    477477ac_subst_files=''
    478478
     
    1966819668          -e 's/$AR t/lib -nologo -list/' \
    1966919669          -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
     19670          -e  's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
    1967019671      libtool > conftest.bla
    1967119672
     
    1967619677  esac
    1967719678esac
     19679
     19680# Unless we are on Darwin, we want to use the -no-undefined flag for
     19681# libtool to be able to create shared objects
     19682case $build in
     19683  *-darwin*)
     19684    LT_LDFLAGS=
     19685    ;;
     19686  *)
     19687    LT_LDFLAGS=-no-undefined
     19688    ;;
     19689esac
     19690
    1967819691
    1967919692
     
    2088720900s,@ac_ct_F77@,$ac_ct_F77,;t t
    2088820901s,@LIBTOOL@,$LIBTOOL,;t t
     20902s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t
    2088920903s,@pkg_lib_dir@,$pkg_lib_dir,;t t
    2089020904s,@pkg_include_dir@,$pkg_include_dir,;t t
  • trunk/Clp/src/Makefile.am

    r773 r776  
    6262
    6363# This is for libtool (on Windows)
    64 libClp_la_LDFLAGS = # -no-undefined
     64libClp_la_LDFLAGS = $(LT_LDFLAGS) `cygpath -w ../../CoinUtils/src/libCoinUtils.la`
    6565
    6666########################################################################
  • trunk/Clp/src/Makefile.in

    r774 r776  
    187187LN_S = @LN_S@
    188188LTLIBOBJS = @LTLIBOBJS@
     189LT_LDFLAGS = @LT_LDFLAGS@
    189190MAINT = @MAINT@
    190191MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
     
    310311
    311312# This is for libtool (on Windows)
    312 libClp_la_LDFLAGS = # -no-undefined
     313libClp_la_LDFLAGS = $(LT_LDFLAGS) `cygpath -w ../../CoinUtils/src/libCoinUtils.la`
    313314
    314315# List all source files for this executable, including headers
  • trunk/Clp/test/Makefile.in

    r774 r776  
    114114LN_S = @LN_S@
    115115LTLIBOBJS = @LTLIBOBJS@
     116LT_LDFLAGS = @LT_LDFLAGS@
    116117MAINT = @MAINT@
    117118MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
Note: See TracChangeset for help on using the changeset viewer.