Ignore:
Timestamp:
Jun 19, 2011 1:23:14 PM (8 years ago)
Author:
stefan
Message:

sync with trunk rev1674

Location:
stable/2.7
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • stable/2.7

    • Property svn:externals

      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.7
        2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
        3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
        4 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
        5 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
        6 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
        7 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
        8 Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
        9 Clp  https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
        10 Osi  https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.7
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
         6ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
         7ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
         8Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
         9Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
         10CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
         11Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
         12Clp               https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
         13Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
    • Property svn:mergeinfo changed
      /trunk (added)merged: 1578,​1582-1587,​1589-1600,​1603-1614,​1620-1626,​1631-1633,​1635-1636,​1638-1646,​1650-1652,​1654-1658,​1660-1663,​1665-1671,​1673-1674

  • stable/2.7/Makefile.in

    r1565 r1675  
    5757        $(top_srcdir)/doxydoc/doxygen.conf.in AUTHORS INSTALL \
    5858        config.guess config.sub depcomp install-sh ltmain.sh missing
    59 @HAVE_EXTERNALS_TRUE@am__append_1 = Externals
    60 @HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
     59@HAVE_EXTERNALS_TRUE@am__append_1 = Dependencies
     60@HAVE_EXTERNALS_TRUE@am__append_2 = .Dependencies-stamp
    6161subdir = .
    6262ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    114114COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
    115115COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
    116 COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
    117 COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
    118 COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    119 COIN_PKG_CONFIG_PATH_UNINSTALLED = @COIN_PKG_CONFIG_PATH_UNINSTALLED@
    120116COIN_SKIP_PROJECTS = @COIN_SKIP_PROJECTS@
    121117CPP = @CPP@
    … …  
    173169PACKAGE_VERSION = @PACKAGE_VERSION@
    174170PATH_SEPARATOR = @PATH_SEPARATOR@
    175 PKG_CONFIG = @PKG_CONFIG@
    176171RANLIB = @RANLIB@
    177172RPATH_FLAGS = @RPATH_FLAGS@
    … …  
    193188ac_ct_STRIP = @ac_ct_STRIP@
    194189ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    195 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    196190am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    197191am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
    … …  
    776770@MAINTAINER_MODE_TRUE@  cp $< $@
    777771
    778 # Take care of updating externals (if Externals file exists)
    779 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Externals-stamp
    780 
    781 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Externals-stamp: $(srcdir)/Externals
    782 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn propset svn:externals -F Externals .
    783 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Externals-stamp
    784 
    785 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Externals-stamp
     772# Take care of updating externals (if Dependencies file exists)
     773@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Dependencies-stamp
     774
     775@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Dependencies-stamp: $(srcdir)/Dependencies
     776@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); BuildTools/set_externals Dependencies
     777@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Dependencies-stamp
     778
     779@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Dependencies-stamp
    786780@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn update
    787781
Note: See TracChangeset for help on using the changeset viewer.