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

sync with trunk rev1674

Location:
stable/2.7
Files:
3 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/Cbc

  • stable/2.7/Cbc/Makefile.in

    r1566 r1675  
    6464        $(srcdir)/osi-cbc.pc.in $(top_srcdir)/configure \
    6565        $(top_srcdir)/doxydoc/doxygen.conf.in \
    66         $(top_srcdir)/examples/Makefile.in \
    67         $(top_srcdir)/inc/config_cbc.h.in AUTHORS INSTALL config.guess \
    68         config.sub depcomp install-sh ltmain.sh missing
    69 @HAVE_EXTERNALS_TRUE@am__append_2 = Externals
    70 @HAVE_EXTERNALS_TRUE@am__append_3 = .Externals-stamp
     66        $(top_srcdir)/examples/Makefile.in AUTHORS INSTALL \
     67        config.guess config.sub depcomp install-sh ltmain.sh missing
     68@HAVE_EXTERNALS_TRUE@am__append_2 = Dependencies
     69@HAVE_EXTERNALS_TRUE@am__append_3 = .Dependencies-stamp
    7170subdir = .
    7271ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    7877 configure.lineno configure.status.lineno
    7978mkinstalldirs = $(install_sh) -d
    80 CONFIG_HEADER = $(top_builddir)/inc/config_cbc.h
     79CONFIG_HEADER = $(top_builddir)/src/config.h \
     80        $(top_builddir)/src/config_cbc.h
    8181CONFIG_CLEAN_FILES = examples/Makefile cbc.pc cbc-uninstalled.pc \
    8282        osi-cbc.pc osi-cbc-uninstalled.pc doxydoc/doxygen.conf
     
    522522$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    523523        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
    524 
    525 inc/config_cbc.h: inc/stamp-h1
    526         @if test ! -f $@; then \
    527           rm -f inc/stamp-h1; \
    528           $(MAKE) inc/stamp-h1; \
    529         else :; fi
    530 
    531 inc/stamp-h1: $(top_srcdir)/inc/config_cbc.h.in $(top_builddir)/config.status
    532         @rm -f inc/stamp-h1
    533         cd $(top_builddir) && $(SHELL) ./config.status inc/config_cbc.h
    534 $(top_srcdir)/inc/config_cbc.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
    535         cd $(top_srcdir) && $(AUTOHEADER)
    536         rm -f inc/stamp-h1
    537         touch $@
    538 
    539 distclean-hdr:
    540         -rm -f inc/config_cbc.h inc/stamp-h1
    541524examples/Makefile: $(top_builddir)/config.status $(top_srcdir)/examples/Makefile.in
    542525        cd $(top_builddir) && $(SHELL) ./config.status $@
     
    714697        $(am__remove_distdir)
    715698        mkdir $(distdir)
    716         $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/doc $(distdir)/doxydoc $(distdir)/examples $(distdir)/inc
     699        $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/doc $(distdir)/doxydoc $(distdir)/examples
    717700        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    718701        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    894877        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
    895878        -rm -f Makefile
    896 distclean-am: clean-am distclean-generic distclean-hdr \
    897         distclean-libtool distclean-local distclean-tags
     879distclean-am: clean-am distclean-generic distclean-libtool \
     880        distclean-local distclean-tags
    898881
    899882dvi: dvi-recursive
     
    948931        clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \
    949932        dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
    950         distclean-generic distclean-hdr distclean-libtool \
    951         distclean-local distclean-recursive distclean-tags \
    952         distcleancheck distdir distuninstallcheck dvi dvi-am html \
    953         html-am info info-am install install-am install-data \
    954         install-data-am install-data-hook install-exec install-exec-am \
     933        distclean-generic distclean-libtool distclean-local \
     934        distclean-recursive distclean-tags distcleancheck distdir \
     935        distuninstallcheck dvi dvi-am html html-am info info-am \
     936        install install-am install-data install-data-am \
     937        install-data-hook install-exec install-exec-am \
    955938        install-exec-local install-info install-info-am install-man \
    956939        install-pkgconfiglibDATA install-strip installcheck \
     
    996979@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    997980@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
    998 @COIN_HAS_PKGCONFIG_FALSE@      echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
     981@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "/libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs_cpp.txt
     982@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
    999983
    1000984uninstall-hook:
     
    10401024@MAINTAINER_MODE_TRUE@  cp $< $@
    10411025
    1042 # Take care of updating externals (if Externals file exists)
    1043 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Externals-stamp
    1044 
    1045 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Externals-stamp: $(srcdir)/Externals
    1046 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn propset svn:externals -F Externals .
    1047 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Externals-stamp
    1048 
    1049 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Externals-stamp
     1026# Take care of updating externals (if Dependencies file exists)
     1027@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Dependencies-stamp
     1028
     1029@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Dependencies-stamp: $(srcdir)/Dependencies
     1030@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); BuildTools/set_externals Dependencies
     1031@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Dependencies-stamp
     1032
     1033@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Dependencies-stamp
    10501034@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn update
    10511035
Note: See TracChangeset for help on using the changeset viewer.