Changeset 3103


Ignore:
Timestamp:
Nov 21, 2013 2:56:05 PM (6 years ago)
Author:
stefan
Message:

conditional addition of dependent libraries into project libs via LIBADD

Location:
ThirdParty/Metis/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Metis/trunk/Makefile.am

    r2084 r3103  
    7272        -I`$(CYGPATH_W) $(srcdir)/$(METISDIR)/Lib`
    7373
     74if DEPENDENCY_LINKING
     75libcoinmetis_la_LIBADD = $(METIS_PCLIBS)
     76endif
     77
    7478libcoinmetis_la_LDFLAGS = $(LT_LDFLAGS)
    7579
  • ThirdParty/Metis/trunk/Makefile.in

    r3060 r3103  
    8181libLTLIBRARIES_INSTALL = $(INSTALL)
    8282LTLIBRARIES = $(lib_LTLIBRARIES)
    83 libcoinmetis_la_LIBADD =
     83am__DEPENDENCIES_1 =
     84@DEPENDENCY_LINKING_TRUE@libcoinmetis_la_DEPENDENCIES =  \
     85@DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1)
    8486am_libcoinmetis_la_OBJECTS = balance.lo bucketsort.lo ccgraph.lo \
    8587        coarsen.lo compress.lo debug.lo estmem.lo fm.lo fortran.lo \
     
    160162DEFS =
    161163DEPDIR = @DEPDIR@
     164DEPENDENCY_LINKING_FALSE = @DEPENDENCY_LINKING_FALSE@
     165DEPENDENCY_LINKING_TRUE = @DEPENDENCY_LINKING_TRUE@
    162166ECHO = @ECHO@
    163167ECHO_C = @ECHO_C@
     
    324328        -I`$(CYGPATH_W) $(srcdir)/$(METISDIR)/Lib`
    325329
     330@DEPENDENCY_LINKING_TRUE@libcoinmetis_la_LIBADD = $(METIS_PCLIBS)
    326331libcoinmetis_la_LDFLAGS = $(LT_LDFLAGS)
    327332thirdpartyincludedir = $(includedir)/coin/ThirdParty
  • ThirdParty/Metis/trunk/configure

    r3060 r3103  
    473473#endif"
    474474
    475 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 ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion METIS_SVN_REV build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC PKG_CONFIG ac_ct_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED EGREP LN_S 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 MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS METISDIR METIS_PCLIBS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
     475ac_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 ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion METIS_SVN_REV build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC PKG_CONFIG ac_ct_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED EGREP LN_S 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 MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS METISDIR METIS_PCLIBS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    2007120071# AC_MSG_NOTICE([End of INIT_AUTO_TOOLS.])
    2007220072
     20073# Check whether --enable-dependency-linking or --disable-dependency-linking was given.
     20074if test "${enable_dependency_linking+set}" = set; then
     20075  enableval="$enable_dependency_linking"
     20076  dependency_linking="$enableval"
     20077else
     20078  dependency_linking=no
     20079fi;
     20080
    2007320081# ToDo
    2007420082# For now, don't use the -no-undefined flag, since the Makefiles are
    2007520083# not yet set up that way.  But we need to fix this, when we want
    2007620084# to comile DLLs under Windows.
    20077 LT_LDFLAGS=
     20085if test "$dependency_linking" = yes ;
     20086then
     20087  LT_LDFLAGS="-no-undefined"
     20088else
     20089  LT_LDFLAGS=
     20090fi
     20091
     20092
     20093
     20094if test "$dependency_linking" = yes; then
     20095  DEPENDENCY_LINKING_TRUE=
     20096  DEPENDENCY_LINKING_FALSE='#'
     20097else
     20098  DEPENDENCY_LINKING_TRUE='#'
     20099  DEPENDENCY_LINKING_FALSE=
     20100fi
     20101
    2007820102
    2007920103# Check if we want to set the library version
     
    2059720621Usually this means the macro was only invoked conditionally." >&5
    2059820622echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
     20623Usually this means the macro was only invoked conditionally." >&2;}
     20624   { (exit 1); exit 1; }; }
     20625fi
     20626if test -z "${DEPENDENCY_LINKING_TRUE}" && test -z "${DEPENDENCY_LINKING_FALSE}"; then
     20627  { { echo "$as_me:$LINENO: error: conditional \"DEPENDENCY_LINKING\" was never defined.
     20628Usually this means the macro was only invoked conditionally." >&5
     20629echo "$as_me: error: conditional \"DEPENDENCY_LINKING\" was never defined.
    2059920630Usually this means the macro was only invoked conditionally." >&2;}
    2060020631   { (exit 1); exit 1; }; }
     
    2122821259s,@ac_cxx_preproc_warn_flag@,$ac_cxx_preproc_warn_flag,;t t
    2122921260s,@RPATH_FLAGS@,$RPATH_FLAGS,;t t
     21261s,@DEPENDENCY_LINKING_TRUE@,$DEPENDENCY_LINKING_TRUE,;t t
     21262s,@DEPENDENCY_LINKING_FALSE@,$DEPENDENCY_LINKING_FALSE,;t t
    2123021263s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t
    2123121264s,@METISDIR@,$METISDIR,;t t
Note: See TracChangeset for help on using the changeset viewer.