Changes from releases/2.8.8 at r2366 to releases/2.8.7 at r2366


Ignore:
Location:
releases
Files:
1 deleted
14 edited

Legend:

Unmodified
Added
Removed
  • releases/2.8.7/Cbc

  • releases/2.8.7/Cbc/Makefile.am

    r2366 r2366  
    1414
    1515SUBDIRS = src
    16 
    17 # Don't do src/OsiCbc recursively, since src/OsiCbc/libOsiCbc depends on src/libCbc
    18 SUBDIRS += src/OsiCbc
    1916
    2017# We don't want to compile the test subdirectory, unless the test target is
     
    143140        echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs.txt
    144141else
    145         echo -L@abs_lib_dir@ -lCbcSolver -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
     142        echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
    146143endif
    147144endif
  • releases/2.8.7/Cbc/Makefile.in

    r2366 r2366  
    100100ETAGS = etags
    101101CTAGS = ctags
    102 DIST_SUBDIRS = src src/OsiCbc test
     102DIST_SUBDIRS = src test
    103103DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    104104distdir = $(PACKAGE)-$(VERSION)
     
    439439#                          Subdirectories                              #
    440440########################################################################
    441 
    442 # Don't do src/OsiCbc recursively, since src/OsiCbc/libOsiCbc depends on src/libCbc
    443 SUBDIRS = src src/OsiCbc $(am__append_1)
     441SUBDIRS = src $(am__append_1)
    444442
    445443########################################################################
     
    984982@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
    985983@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs.txt
    986 @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lCbcSolver -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
     984@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
    987985
    988986uninstall-hook:
  • releases/2.8.7/Cbc/configure

    r2366 r2366  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Cbc 2.8.8.
     3# Generated by GNU Autoconf 2.59 for Cbc 2.8.7.
    44#
    55# Report bugs to <cbc@lists.coin-or.org>.
     
    430430PACKAGE_NAME='Cbc'
    431431PACKAGE_TARNAME='cbc'
    432 PACKAGE_VERSION='2.8.8'
    433 PACKAGE_STRING='Cbc 2.8.8'
     432PACKAGE_VERSION='2.8.7'
     433PACKAGE_STRING='Cbc 2.8.7'
    434434PACKAGE_BUGREPORT='cbc@lists.coin-or.org'
    435435
     
    10061006  # This message is too long to be a string in the A/UX 3.1 sh.
    10071007  cat <<_ACEOF
    1008 \`configure' configures Cbc 2.8.8 to adapt to many kinds of systems.
     1008\`configure' configures Cbc 2.8.7 to adapt to many kinds of systems.
    10091009
    10101010Usage: $0 [OPTION]... [VAR=VALUE]...
     
    10721072if test -n "$ac_init_help"; then
    10731073  case $ac_init_help in
    1074      short | recursive ) echo "Configuration of Cbc 2.8.8:";;
     1074     short | recursive ) echo "Configuration of Cbc 2.8.7:";;
    10751075   esac
    10761076  cat <<\_ACEOF
     
    13061306if $ac_init_version; then
    13071307  cat <<\_ACEOF
    1308 Cbc configure 2.8.8
     1308Cbc configure 2.8.7
    13091309generated by GNU Autoconf 2.59
    13101310
     
    13261326running configure, to aid debugging if configure makes a mistake.
    13271327
    1328 It was created by Cbc $as_me 2.8.8, which was
     1328It was created by Cbc $as_me 2.8.7, which was
    13291329generated by GNU Autoconf 2.59.  Invocation command line was
    13301330
     
    18521852
    18531853# Capture libtool library version, if given.
    1854  coin_libversion=11:8:8
     1854 coin_libversion=11:7:8
    18551855
    18561856
     
    41654165      coin_disable_shared=yes
    41664166      if test x"$enable_shared" = xyes; then
    4167         case "$CC" in
     4167        case "$CXX" in
    41684168          clang* )
    41694169            { echo "$as_me:$LINENO: WARNING: DLL building not supported. I'm disabling your choice." >&5
     
    41734173            { echo "$as_me:$LINENO: DLL building not supported, but will build with -MD(d) instead of -MT(d)." >&5
    41744174echo "$as_me: DLL building not supported, but will build with -MD(d) instead of -MT(d)." >&6;}
    4175             ;;
    4176           *gcc*)
    4177             if test x"$enable_dependency_linking" = xyes; then
    4178               coin_disable_shared=no
    4179             else
    4180               { echo "$as_me:$LINENO: WARNING: To build shared libraries with gcc on CYGWIN or MSys, use --enable-dependency-linking" >&5
    4181 echo "$as_me: WARNING: To build shared libraries with gcc on CYGWIN or MSys, use --enable-dependency-linking" >&2;}
    4182             fi
    41834175            ;;
    41844176          *)
     
    46154607# Define the identity of the package.
    46164608 PACKAGE='cbc'
    4617  VERSION='2.8.8'
     4609 VERSION='2.8.7'
    46184610
    46194611
     
    59115903*-*-irix6*)
    59125904  # Find out which ABI we are using.
    5913   echo '#line 5913 "configure"' > conftest.$ac_ext
     5905  echo '#line 5905 "configure"' > conftest.$ac_ext
    59145906  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    59155907  (eval $ac_compile) 2>&5
     
    70457037
    70467038# Provide some information about the compiler.
    7047 echo "$as_me:7047:" \
     7039echo "$as_me:7039:" \
    70487040     "checking for Fortran 77 compiler version" >&5
    70497041ac_compiler=`set X $ac_compile; echo $2`
     
    81128104   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81138105   -e 's:$: $lt_compiler_flag:'`
    8114    (eval echo "\"\$as_me:8114: $lt_compile\"" >&5)
     8106   (eval echo "\"\$as_me:8106: $lt_compile\"" >&5)
    81158107   (eval "$lt_compile" 2>conftest.err)
    81168108   ac_status=$?
    81178109   cat conftest.err >&5
    8118    echo "$as_me:8118: \$? = $ac_status" >&5
     8110   echo "$as_me:8110: \$? = $ac_status" >&5
    81198111   if (exit $ac_status) && test -s "$ac_outfile"; then
    81208112     # The compiler can only warn and ignore the option if not recognized
     
    83808372   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83818373   -e 's:$: $lt_compiler_flag:'`
    8382    (eval echo "\"\$as_me:8382: $lt_compile\"" >&5)
     8374   (eval echo "\"\$as_me:8374: $lt_compile\"" >&5)
    83838375   (eval "$lt_compile" 2>conftest.err)
    83848376   ac_status=$?
    83858377   cat conftest.err >&5
    8386    echo "$as_me:8386: \$? = $ac_status" >&5
     8378   echo "$as_me:8378: \$? = $ac_status" >&5
    83878379   if (exit $ac_status) && test -s "$ac_outfile"; then
    83888380     # The compiler can only warn and ignore the option if not recognized
     
    84848476   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84858477   -e 's:$: $lt_compiler_flag:'`
    8486    (eval echo "\"\$as_me:8486: $lt_compile\"" >&5)
     8478   (eval echo "\"\$as_me:8478: $lt_compile\"" >&5)
    84878479   (eval "$lt_compile" 2>out/conftest.err)
    84888480   ac_status=$?
    84898481   cat out/conftest.err >&5
    8490    echo "$as_me:8490: \$? = $ac_status" >&5
     8482   echo "$as_me:8482: \$? = $ac_status" >&5
    84918483   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84928484   then
     
    1082910821  lt_status=$lt_dlunknown
    1083010822  cat > conftest.$ac_ext <<EOF
    10831 #line 10831 "configure"
     10823#line 10823 "configure"
    1083210824#include "confdefs.h"
    1083310825
     
    1092910921  lt_status=$lt_dlunknown
    1093010922  cat > conftest.$ac_ext <<EOF
    10931 #line 10931 "configure"
     10923#line 10923 "configure"
    1093210924#include "confdefs.h"
    1093310925
     
    1327313265   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1327413266   -e 's:$: $lt_compiler_flag:'`
    13275    (eval echo "\"\$as_me:13275: $lt_compile\"" >&5)
     13267   (eval echo "\"\$as_me:13267: $lt_compile\"" >&5)
    1327613268   (eval "$lt_compile" 2>conftest.err)
    1327713269   ac_status=$?
    1327813270   cat conftest.err >&5
    13279    echo "$as_me:13279: \$? = $ac_status" >&5
     13271   echo "$as_me:13271: \$? = $ac_status" >&5
    1328013272   if (exit $ac_status) && test -s "$ac_outfile"; then
    1328113273     # The compiler can only warn and ignore the option if not recognized
     
    1337713369   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1337813370   -e 's:$: $lt_compiler_flag:'`
    13379    (eval echo "\"\$as_me:13379: $lt_compile\"" >&5)
     13371   (eval echo "\"\$as_me:13371: $lt_compile\"" >&5)
    1338013372   (eval "$lt_compile" 2>out/conftest.err)
    1338113373   ac_status=$?
    1338213374   cat out/conftest.err >&5
    13383    echo "$as_me:13383: \$? = $ac_status" >&5
     13375   echo "$as_me:13375: \$? = $ac_status" >&5
    1338413376   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1338513377   then
     
    1494714939   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1494814940   -e 's:$: $lt_compiler_flag:'`
    14949    (eval echo "\"\$as_me:14949: $lt_compile\"" >&5)
     14941   (eval echo "\"\$as_me:14941: $lt_compile\"" >&5)
    1495014942   (eval "$lt_compile" 2>conftest.err)
    1495114943   ac_status=$?
    1495214944   cat conftest.err >&5
    14953    echo "$as_me:14953: \$? = $ac_status" >&5
     14945   echo "$as_me:14945: \$? = $ac_status" >&5
    1495414946   if (exit $ac_status) && test -s "$ac_outfile"; then
    1495514947     # The compiler can only warn and ignore the option if not recognized
     
    1505115043   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1505215044   -e 's:$: $lt_compiler_flag:'`
    15053    (eval echo "\"\$as_me:15053: $lt_compile\"" >&5)
     15045   (eval echo "\"\$as_me:15045: $lt_compile\"" >&5)
    1505415046   (eval "$lt_compile" 2>out/conftest.err)
    1505515047   ac_status=$?
    1505615048   cat out/conftest.err >&5
    15057    echo "$as_me:15057: \$? = $ac_status" >&5
     15049   echo "$as_me:15049: \$? = $ac_status" >&5
    1505815050   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1505915051   then
     
    1725817250   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1725917251   -e 's:$: $lt_compiler_flag:'`
    17260    (eval echo "\"\$as_me:17260: $lt_compile\"" >&5)
     17252   (eval echo "\"\$as_me:17252: $lt_compile\"" >&5)
    1726117253   (eval "$lt_compile" 2>conftest.err)
    1726217254   ac_status=$?
    1726317255   cat conftest.err >&5
    17264    echo "$as_me:17264: \$? = $ac_status" >&5
     17256   echo "$as_me:17256: \$? = $ac_status" >&5
    1726517257   if (exit $ac_status) && test -s "$ac_outfile"; then
    1726617258     # The compiler can only warn and ignore the option if not recognized
     
    1752617518   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1752717519   -e 's:$: $lt_compiler_flag:'`
    17528    (eval echo "\"\$as_me:17528: $lt_compile\"" >&5)
     17520   (eval echo "\"\$as_me:17520: $lt_compile\"" >&5)
    1752917521   (eval "$lt_compile" 2>conftest.err)
    1753017522   ac_status=$?
    1753117523   cat conftest.err >&5
    17532    echo "$as_me:17532: \$? = $ac_status" >&5
     17524   echo "$as_me:17524: \$? = $ac_status" >&5
    1753317525   if (exit $ac_status) && test -s "$ac_outfile"; then
    1753417526     # The compiler can only warn and ignore the option if not recognized
     
    1763017622   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1763117623   -e 's:$: $lt_compiler_flag:'`
    17632    (eval echo "\"\$as_me:17632: $lt_compile\"" >&5)
     17624   (eval echo "\"\$as_me:17624: $lt_compile\"" >&5)
    1763317625   (eval "$lt_compile" 2>out/conftest.err)
    1763417626   ac_status=$?
    1763517627   cat out/conftest.err >&5
    17636    echo "$as_me:17636: \$? = $ac_status" >&5
     17628   echo "$as_me:17628: \$? = $ac_status" >&5
    1763717629   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1763817630   then
     
    3120031192cat >&5 <<_CSEOF
    3120131193
    31202 This file was extended by Cbc $as_me 2.8.8, which was
     31194This file was extended by Cbc $as_me 2.8.7, which was
    3120331195generated by GNU Autoconf 2.59.  Invocation command line was
    3120431196
     
    3126331255cat >>$CONFIG_STATUS <<_ACEOF
    3126431256ac_cs_version="\\
    31265 Cbc config.status 2.8.8
     31257Cbc config.status 2.8.7
    3126631258configured by $0, generated by GNU Autoconf 2.59,
    3126731259  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/2.8.7/Cbc/configure.ac

    r2366 r2366  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.8.8],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[2.8.7],[cbc@lists.coin-or.org])
    1616
    1717AC_COPYRIGHT([
     
    4242# externals.  The following macro ensures that those externals are
    4343# retrieved by svn if they are not there yet.
    44 AC_COIN_PROJECTDIR_INIT(Cbc,11:8:8)
     44AC_COIN_PROJECTDIR_INIT(Cbc,11:7:8)
    4545
    4646# Check if user wants to produce debugging code
  • releases/2.8.7/Cbc/src/CbcEventHandler.hpp

    r2366 r2366  
    4646
    4747*/
    48 #include <cstddef>
     48
    4949#include <map>
    5050
  • releases/2.8.7/Cbc/src/Makefile.am

    r2366 r2366  
    88
    99AUTOMAKE_OPTIONS = foreign
     10
     11SUBDIRS = OsiCbc
    1012
    1113########################################################################
     
    101103        CbcMipStartIO.cpp CbcMipStartIO.hpp \
    102104        CbcSolverExpandKnapsack.cpp CbcSolverExpandKnapsack.hpp
    103 
    104 # List all additionally required libraries
    105 if DEPENDENCY_LINKING
    106 libCbc_la_LIBADD = $(CBCLIB_LIBS)
    107 libCbcSolver_la_LIBADD = $(CBCLIB_LIBS) libCbc.la
    108 endif
    109105
    110106# This is for libtool
     
    272268        test -s cbc.exe.manifest && \
    273269        mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
    274         cp cbc.exe $(bindir)/cbc.exe
     270        cp cbc.exe $(bindir)/clp.exe
    275271endif
    276272
  • releases/2.8.7/Cbc/src/Makefile.in

    r2366 r2366  
    8989libLTLIBRARIES_INSTALL = $(INSTALL)
    9090LTLIBRARIES = $(lib_LTLIBRARIES)
    91 am__DEPENDENCIES_1 =
    92 @DEPENDENCY_LINKING_TRUE@libCbc_la_DEPENDENCIES =  \
    93 @DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1)
     91libCbc_la_LIBADD =
    9492am_libCbc_la_OBJECTS = Cbc_C_Interface.lo CbcBranchAllDifferent.lo \
    9593        CbcBranchCut.lo CbcBranchDecision.lo \
     
    118116        CbcTreeLocal.lo
    119117libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS)
    120 @DEPENDENCY_LINKING_TRUE@libCbcSolver_la_DEPENDENCIES =  \
    121 @DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1) libCbc.la
     118libCbcSolver_la_LIBADD =
    122119am_libCbcSolver_la_OBJECTS = CbcCbcParam.lo Cbc_ampl.lo CbcLinked.lo \
    123120        CbcLinkedUtils.lo unitTestClp.lo CbcSolver.lo \
     
    132129@COIN_HAS_CLP_TRUE@am_cbc_OBJECTS = CoinSolve.$(OBJEXT)
    133130cbc_OBJECTS = $(am_cbc_OBJECTS)
     131am__DEPENDENCIES_1 =
    134132am__cbc_generic_SOURCES_DIST = CbcGenBaB.cpp CbcGenCbcParam.cpp \
    135133        CbcGenCbcParam.hpp CbcGenCbcParamUtils.cpp CbcGenCtlBlk.cpp \
     
    174172DIST_SOURCES = $(libCbc_la_SOURCES) $(libCbcSolver_la_SOURCES) \
    175173        $(am__cbc_SOURCES_DIST) $(am__cbc_generic_SOURCES_DIST)
     174RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
     175        html-recursive info-recursive install-data-recursive \
     176        install-exec-recursive install-info-recursive \
     177        install-recursive installcheck-recursive installdirs-recursive \
     178        pdf-recursive ps-recursive uninstall-info-recursive \
     179        uninstall-recursive
    176180includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
    177181HEADERS = $(includecoin_HEADERS)
    178182ETAGS = etags
    179183CTAGS = ctags
     184DIST_SUBDIRS = $(SUBDIRS)
    180185DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    181186ABSBUILDDIR = @ABSBUILDDIR@
     
    502507target_alias = @target_alias@
    503508AUTOMAKE_OPTIONS = foreign
     509SUBDIRS = OsiCbc
    504510
    505511########################################################################
     
    596602        CbcSolverExpandKnapsack.cpp CbcSolverExpandKnapsack.hpp
    597603
    598 
    599 # List all additionally required libraries
    600 @DEPENDENCY_LINKING_TRUE@libCbc_la_LIBADD = $(CBCLIB_LIBS)
    601 @DEPENDENCY_LINKING_TRUE@libCbcSolver_la_LIBADD = $(CBCLIB_LIBS) libCbc.la
    602604
    603605# This is for libtool
     
    721723
    722724all: config.h config_cbc.h
    723         $(MAKE) $(AM_MAKEFLAGS) all-am
     725        $(MAKE) $(AM_MAKEFLAGS) all-recursive
    724726
    725727.SUFFIXES:
     
    988990        done
    989991
     992# This directory's subdirectories are mostly independent; you can cd
     993# into them and run `make' without going through this Makefile.
     994# To change the values of `make' variables: instead of editing Makefiles,
     995# (1) if the variable is set in `config.status', edit `config.status'
     996#     (which will cause the Makefiles to be regenerated when you run `make');
     997# (2) otherwise, pass the desired values on the `make' command line.
     998$(RECURSIVE_TARGETS):
     999        @failcom='exit 1'; \
     1000        for f in x $$MAKEFLAGS; do \
     1001          case $$f in \
     1002            *=* | --[!k]*);; \
     1003            *k*) failcom='fail=yes';; \
     1004          esac; \
     1005        done; \
     1006        dot_seen=no; \
     1007        target=`echo $@ | sed s/-recursive//`; \
     1008        list='$(SUBDIRS)'; for subdir in $$list; do \
     1009          echo "Making $$target in $$subdir"; \
     1010          if test "$$subdir" = "."; then \
     1011            dot_seen=yes; \
     1012            local_target="$$target-am"; \
     1013          else \
     1014            local_target="$$target"; \
     1015          fi; \
     1016          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
     1017          || eval $$failcom; \
     1018        done; \
     1019        if test "$$dot_seen" = "no"; then \
     1020          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
     1021        fi; test -z "$$fail"
     1022
     1023mostlyclean-recursive clean-recursive distclean-recursive \
     1024maintainer-clean-recursive:
     1025        @failcom='exit 1'; \
     1026        for f in x $$MAKEFLAGS; do \
     1027          case $$f in \
     1028            *=* | --[!k]*);; \
     1029            *k*) failcom='fail=yes';; \
     1030          esac; \
     1031        done; \
     1032        dot_seen=no; \
     1033        case "$@" in \
     1034          distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
     1035          *) list='$(SUBDIRS)' ;; \
     1036        esac; \
     1037        rev=''; for subdir in $$list; do \
     1038          if test "$$subdir" = "."; then :; else \
     1039            rev="$$subdir $$rev"; \
     1040          fi; \
     1041        done; \
     1042        rev="$$rev ."; \
     1043        target=`echo $@ | sed s/-recursive//`; \
     1044        for subdir in $$rev; do \
     1045          echo "Making $$target in $$subdir"; \
     1046          if test "$$subdir" = "."; then \
     1047            local_target="$$target-am"; \
     1048          else \
     1049            local_target="$$target"; \
     1050          fi; \
     1051          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
     1052          || eval $$failcom; \
     1053        done && test -z "$$fail"
     1054tags-recursive:
     1055        list='$(SUBDIRS)'; for subdir in $$list; do \
     1056          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
     1057        done
     1058ctags-recursive:
     1059        list='$(SUBDIRS)'; for subdir in $$list; do \
     1060          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
     1061        done
     1062
    9901063ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
    9911064        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     
    9981071tags: TAGS
    9991072
    1000 TAGS: $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \
     1073TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \
    10011074                $(TAGS_FILES) $(LISP)
    10021075        tags=; \
    10031076        here=`pwd`; \
     1077        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
     1078          include_option=--etags-include; \
     1079          empty_fix=.; \
     1080        else \
     1081          include_option=--include; \
     1082          empty_fix=; \
     1083        fi; \
     1084        list='$(SUBDIRS)'; for subdir in $$list; do \
     1085          if test "$$subdir" = .; then :; else \
     1086            test ! -f $$subdir/TAGS || \
     1087              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
     1088          fi; \
     1089        done; \
    10041090        list='$(SOURCES) $(HEADERS) config.h.in config_cbc.h.in $(LISP) $(TAGS_FILES)'; \
    10051091        unique=`for i in $$list; do \
     
    10141100        fi
    10151101ctags: CTAGS
    1016 CTAGS: $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \
     1102CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \
    10171103                $(TAGS_FILES) $(LISP)
    10181104        tags=; \
     
    10631149          fi; \
    10641150        done
     1151        list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
     1152          if test "$$subdir" = .; then :; else \
     1153            test -d "$(distdir)/$$subdir" \
     1154            || $(mkdir_p) "$(distdir)/$$subdir" \
     1155            || exit 1; \
     1156            distdir=`$(am__cd) $(distdir) && pwd`; \
     1157            top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
     1158            (cd $$subdir && \
     1159              $(MAKE) $(AM_MAKEFLAGS) \
     1160                top_distdir="$$top_distdir" \
     1161                distdir="$$distdir/$$subdir" \
     1162                distdir) \
     1163              || exit 1; \
     1164          fi; \
     1165        done
    10651166check-am: all-am
    1066 check: check-am
     1167check: check-recursive
    10671168all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) config.h \
    10681169                config_cbc.h
    10691170install-binPROGRAMS: install-libLTLIBRARIES
    10701171
    1071 installdirs:
     1172installdirs: installdirs-recursive
     1173installdirs-am:
    10721174        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
    10731175          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    10741176        done
    1075 install: install-am
    1076 install-exec: install-exec-am
    1077 install-data: install-data-am
    1078 uninstall: uninstall-am
     1177install: install-recursive
     1178install-exec: install-exec-recursive
     1179install-data: install-data-recursive
     1180uninstall: uninstall-recursive
    10791181
    10801182install-am: all-am
    10811183        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
    10821184
    1083 installcheck: installcheck-am
     1185installcheck: installcheck-recursive
    10841186install-strip:
    10851187        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
     
    10981200        @echo "it deletes files that may require special tools to rebuild."
    10991201@COIN_CXX_IS_CL_FALSE@install-exec-hook:
    1100 clean: clean-am
     1202clean: clean-recursive
    11011203
    11021204clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
    11031205        clean-libtool mostlyclean-am
    11041206
    1105 distclean: distclean-am
     1207distclean: distclean-recursive
    11061208        -rm -rf ./$(DEPDIR)
    11071209        -rm -f Makefile
     
    11091211        distclean-hdr distclean-libtool distclean-tags
    11101212
    1111 dvi: dvi-am
     1213dvi: dvi-recursive
    11121214
    11131215dvi-am:
    11141216
    1115 html: html-am
    1116 
    1117 info: info-am
     1217html: html-recursive
     1218
     1219info: info-recursive
    11181220
    11191221info-am:
     
    11261228        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
    11271229
    1128 install-info: install-info-am
     1230install-info: install-info-recursive
    11291231
    11301232install-man:
     
    11321234installcheck-am:
    11331235
    1134 maintainer-clean: maintainer-clean-am
     1236maintainer-clean: maintainer-clean-recursive
    11351237        -rm -rf ./$(DEPDIR)
    11361238        -rm -f Makefile
    11371239maintainer-clean-am: distclean-am maintainer-clean-generic
    11381240
    1139 mostlyclean: mostlyclean-am
     1241mostlyclean: mostlyclean-recursive
    11401242
    11411243mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    11421244        mostlyclean-libtool
    11431245
    1144 pdf: pdf-am
     1246pdf: pdf-recursive
    11451247
    11461248pdf-am:
    11471249
    1148 ps: ps-am
     1250ps: ps-recursive
    11491251
    11501252ps-am:
     
    11531255        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    11541256
    1155 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
    1156         clean-generic clean-libLTLIBRARIES clean-libtool ctags \
    1157         distclean distclean-compile distclean-generic distclean-hdr \
    1158         distclean-libtool distclean-tags distdir dvi dvi-am html \
    1159         html-am info info-am install install-am install-binPROGRAMS \
    1160         install-data install-data-am install-exec install-exec-am \
    1161         install-exec-hook install-exec-local \
     1257uninstall-info: uninstall-info-recursive
     1258
     1259.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
     1260        clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
     1261        clean-libtool clean-recursive ctags ctags-recursive distclean \
     1262        distclean-compile distclean-generic distclean-hdr \
     1263        distclean-libtool distclean-recursive distclean-tags distdir \
     1264        dvi dvi-am html html-am info info-am install install-am \
     1265        install-binPROGRAMS install-data install-data-am install-exec \
     1266        install-exec-am install-exec-hook install-exec-local \
    11621267        install-includecoinHEADERS install-info install-info-am \
    11631268        install-libLTLIBRARIES install-man install-strip installcheck \
    1164         installcheck-am installdirs maintainer-clean \
    1165         maintainer-clean-generic mostlyclean mostlyclean-compile \
    1166         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    1167         tags uninstall uninstall-am uninstall-binPROGRAMS \
    1168         uninstall-includecoinHEADERS uninstall-info-am \
    1169         uninstall-libLTLIBRARIES uninstall-local
     1269        installcheck-am installdirs installdirs-am maintainer-clean \
     1270        maintainer-clean-generic maintainer-clean-recursive \
     1271        mostlyclean mostlyclean-compile mostlyclean-generic \
     1272        mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
     1273        tags tags-recursive uninstall uninstall-am \
     1274        uninstall-binPROGRAMS uninstall-includecoinHEADERS \
     1275        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    11701276
    11711277
     
    11771283@COIN_CXX_IS_CL_TRUE@   test -s cbc.exe.manifest && \
    11781284@COIN_CXX_IS_CL_TRUE@   mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
    1179 @COIN_CXX_IS_CL_TRUE@   cp cbc.exe $(bindir)/cbc.exe
     1285@COIN_CXX_IS_CL_TRUE@   cp cbc.exe $(bindir)/clp.exe
    11801286
    11811287#######################################################################
  • releases/2.8.7/Cbc/src/OsiCbc/Makefile.am

    r2366 r2366  
    1818# List all source files for this library, including headers
    1919libOsiCbc_la_SOURCES = OsiCbcSolverInterface.cpp OsiCbcSolverInterface.hpp
    20 
    21 # List all additionally required libraries
    22 if DEPENDENCY_LINKING
    23 libOsiCbc_la_LIBADD = $(CBCLIB_LIBS) ../libCbc.la
    24 endif
    2520
    2621# This is for libtool (on Windows)
  • releases/2.8.7/Cbc/src/OsiCbc/Makefile.in

    r2366 r2366  
    7575libLTLIBRARIES_INSTALL = $(INSTALL)
    7676LTLIBRARIES = $(lib_LTLIBRARIES)
    77 am__DEPENDENCIES_1 =
    78 @DEPENDENCY_LINKING_TRUE@libOsiCbc_la_DEPENDENCIES =  \
    79 @DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1) ../libCbc.la
     77libOsiCbc_la_LIBADD =
    8078am_libOsiCbc_la_OBJECTS = OsiCbcSolverInterface.lo
    8179libOsiCbc_la_OBJECTS = $(am_libOsiCbc_la_OBJECTS)
     
    439437libOsiCbc_la_SOURCES = OsiCbcSolverInterface.cpp OsiCbcSolverInterface.hpp
    440438
    441 # List all additionally required libraries
    442 @DEPENDENCY_LINKING_TRUE@libOsiCbc_la_LIBADD = $(CBCLIB_LIBS) ../libCbc.la
    443 
    444439# This is for libtool (on Windows)
    445440libOsiCbc_la_LDFLAGS = $(LT_LDFLAGS)
  • releases/2.8.7/Cbc/src/config_cbc_default.h

    r2366 r2366  
    66
    77/* Version number of project */
    8 #define CBC_VERSION "2.8.8"
     8#define CBC_VERSION "2.8.7"
    99
    1010/* Major Version number of project */
     
    1515
    1616/* Release Version number of project */
    17 #define CBC_VERSION_RELEASE 8
     17#define CBC_VERSION_RELEASE 7
  • releases/2.8.7/Cbc/src/unitTestClp.cpp

    r2366 r2366  
    141141      << "Perhaps you're trying to read gzipped (.gz) files without libz?"
    142142      << std::endl ;
    143     return (0) ;
     143    return (-1) ;
    144144  }
    145145  int dfltPrecision = static_cast<int>(std::cout.precision()) ;
  • releases/2.8.7/configure

    r2366 r2366  
    22# From configure.ac 0.9.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.59 for Cbc 2.8.8.
     4# Generated by GNU Autoconf 2.59 for Cbc 2.8.7.
    55#
    66# Report bugs to <cbc@lists.coin-or.org>.
     
    431431PACKAGE_NAME='Cbc'
    432432PACKAGE_TARNAME='cbc'
    433 PACKAGE_VERSION='2.8.8'
    434 PACKAGE_STRING='Cbc 2.8.8'
     433PACKAGE_VERSION='2.8.7'
     434PACKAGE_STRING='Cbc 2.8.7'
    435435PACKAGE_BUGREPORT='cbc@lists.coin-or.org'
    436436
     
    10391039  # This message is too long to be a string in the A/UX 3.1 sh.
    10401040  cat <<_ACEOF
    1041 \`configure' configures Cbc 2.8.8 to adapt to many kinds of systems.
     1041\`configure' configures Cbc 2.8.7 to adapt to many kinds of systems.
    10421042
    10431043Usage: $0 [OPTION]... [VAR=VALUE]...
     
    11051105if test -n "$ac_init_help"; then
    11061106  case $ac_init_help in
    1107      short | recursive ) echo "Configuration of Cbc 2.8.8:";;
     1107     short | recursive ) echo "Configuration of Cbc 2.8.7:";;
    11081108   esac
    11091109  cat <<\_ACEOF
     
    13281328if $ac_init_version; then
    13291329  cat <<\_ACEOF
    1330 Cbc configure 2.8.8
     1330Cbc configure 2.8.7
    13311331generated by GNU Autoconf 2.59
    13321332
     
    13481348running configure, to aid debugging if configure makes a mistake.
    13491349
    1350 It was created by Cbc $as_me 2.8.8, which was
     1350It was created by Cbc $as_me 2.8.7, which was
    13511351generated by GNU Autoconf 2.59.  Invocation command line was
    13521352
     
    47194719      coin_disable_shared=yes
    47204720      if test x"$enable_shared" = xyes; then
    4721         case "$CC" in
     4721        case "$CXX" in
    47224722          clang* )
    47234723            { echo "$as_me:$LINENO: WARNING: DLL building not supported. I'm disabling your choice." >&5
     
    47274727            { echo "$as_me:$LINENO: DLL building not supported, but will build with -MD(d) instead of -MT(d)." >&5
    47284728echo "$as_me: DLL building not supported, but will build with -MD(d) instead of -MT(d)." >&6;}
    4729             ;;
    4730           *gcc*)
    4731             if test x"$enable_dependency_linking" = xyes; then
    4732               coin_disable_shared=no
    4733             else
    4734               { echo "$as_me:$LINENO: WARNING: To build shared libraries with gcc on CYGWIN or MSys, use --enable-dependency-linking" >&5
    4735 echo "$as_me: WARNING: To build shared libraries with gcc on CYGWIN or MSys, use --enable-dependency-linking" >&2;}
    4736             fi
    47374729            ;;
    47384730          *)
     
    51695161# Define the identity of the package.
    51705162 PACKAGE='cbc'
    5171  VERSION='2.8.8'
     5163 VERSION='2.8.7'
    51725164
    51735165
     
    64656457*-*-irix6*)
    64666458  # Find out which ABI we are using.
    6467   echo '#line 6467 "configure"' > conftest.$ac_ext
     6459  echo '#line 6459 "configure"' > conftest.$ac_ext
    64686460  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    64696461  (eval $ac_compile) 2>&5
     
    84298421   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84308422   -e 's:$: $lt_compiler_flag:'`
    8431    (eval echo "\"\$as_me:8431: $lt_compile\"" >&5)
     8423   (eval echo "\"\$as_me:8423: $lt_compile\"" >&5)
    84328424   (eval "$lt_compile" 2>conftest.err)
    84338425   ac_status=$?
    84348426   cat conftest.err >&5
    8435    echo "$as_me:8435: \$? = $ac_status" >&5
     8427   echo "$as_me:8427: \$? = $ac_status" >&5
    84368428   if (exit $ac_status) && test -s "$ac_outfile"; then
    84378429     # The compiler can only warn and ignore the option if not recognized
     
    86978689   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    86988690   -e 's:$: $lt_compiler_flag:'`
    8699    (eval echo "\"\$as_me:8699: $lt_compile\"" >&5)
     8691   (eval echo "\"\$as_me:8691: $lt_compile\"" >&5)
    87008692   (eval "$lt_compile" 2>conftest.err)
    87018693   ac_status=$?
    87028694   cat conftest.err >&5
    8703    echo "$as_me:8703: \$? = $ac_status" >&5
     8695   echo "$as_me:8695: \$? = $ac_status" >&5
    87048696   if (exit $ac_status) && test -s "$ac_outfile"; then
    87058697     # The compiler can only warn and ignore the option if not recognized
     
    88018793   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    88028794   -e 's:$: $lt_compiler_flag:'`
    8803    (eval echo "\"\$as_me:8803: $lt_compile\"" >&5)
     8795   (eval echo "\"\$as_me:8795: $lt_compile\"" >&5)
    88048796   (eval "$lt_compile" 2>out/conftest.err)
    88058797   ac_status=$?
    88068798   cat out/conftest.err >&5
    8807    echo "$as_me:8807: \$? = $ac_status" >&5
     8799   echo "$as_me:8799: \$? = $ac_status" >&5
    88088800   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    88098801   then
     
    1114611138  lt_status=$lt_dlunknown
    1114711139  cat > conftest.$ac_ext <<EOF
    11148 #line 11148 "configure"
     11140#line 11140 "configure"
    1114911141#include "confdefs.h"
    1115011142
     
    1124611238  lt_status=$lt_dlunknown
    1124711239  cat > conftest.$ac_ext <<EOF
    11248 #line 11248 "configure"
     11240#line 11240 "configure"
    1124911241#include "confdefs.h"
    1125011242
     
    1359013582   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1359113583   -e 's:$: $lt_compiler_flag:'`
    13592    (eval echo "\"\$as_me:13592: $lt_compile\"" >&5)
     13584   (eval echo "\"\$as_me:13584: $lt_compile\"" >&5)
    1359313585   (eval "$lt_compile" 2>conftest.err)
    1359413586   ac_status=$?
    1359513587   cat conftest.err >&5
    13596    echo "$as_me:13596: \$? = $ac_status" >&5
     13588   echo "$as_me:13588: \$? = $ac_status" >&5
    1359713589   if (exit $ac_status) && test -s "$ac_outfile"; then
    1359813590     # The compiler can only warn and ignore the option if not recognized
     
    1369413686   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1369513687   -e 's:$: $lt_compiler_flag:'`
    13696    (eval echo "\"\$as_me:13696: $lt_compile\"" >&5)
     13688   (eval echo "\"\$as_me:13688: $lt_compile\"" >&5)
    1369713689   (eval "$lt_compile" 2>out/conftest.err)
    1369813690   ac_status=$?
    1369913691   cat out/conftest.err >&5
    13700    echo "$as_me:13700: \$? = $ac_status" >&5
     13692   echo "$as_me:13692: \$? = $ac_status" >&5
    1370113693   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1370213694   then
     
    1526415256   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1526515257   -e 's:$: $lt_compiler_flag:'`
    15266    (eval echo "\"\$as_me:15266: $lt_compile\"" >&5)
     15258   (eval echo "\"\$as_me:15258: $lt_compile\"" >&5)
    1526715259   (eval "$lt_compile" 2>conftest.err)
    1526815260   ac_status=$?
    1526915261   cat conftest.err >&5
    15270    echo "$as_me:15270: \$? = $ac_status" >&5
     15262   echo "$as_me:15262: \$? = $ac_status" >&5
    1527115263   if (exit $ac_status) && test -s "$ac_outfile"; then
    1527215264     # The compiler can only warn and ignore the option if not recognized
     
    1536815360   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1536915361   -e 's:$: $lt_compiler_flag:'`
    15370    (eval echo "\"\$as_me:15370: $lt_compile\"" >&5)
     15362   (eval echo "\"\$as_me:15362: $lt_compile\"" >&5)
    1537115363   (eval "$lt_compile" 2>out/conftest.err)
    1537215364   ac_status=$?
    1537315365   cat out/conftest.err >&5
    15374    echo "$as_me:15374: \$? = $ac_status" >&5
     15366   echo "$as_me:15366: \$? = $ac_status" >&5
    1537515367   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1537615368   then
     
    1757517567   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1757617568   -e 's:$: $lt_compiler_flag:'`
    17577    (eval echo "\"\$as_me:17577: $lt_compile\"" >&5)
     17569   (eval echo "\"\$as_me:17569: $lt_compile\"" >&5)
    1757817570   (eval "$lt_compile" 2>conftest.err)
    1757917571   ac_status=$?
    1758017572   cat conftest.err >&5
    17581    echo "$as_me:17581: \$? = $ac_status" >&5
     17573   echo "$as_me:17573: \$? = $ac_status" >&5
    1758217574   if (exit $ac_status) && test -s "$ac_outfile"; then
    1758317575     # The compiler can only warn and ignore the option if not recognized
     
    1784317835   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1784417836   -e 's:$: $lt_compiler_flag:'`
    17845    (eval echo "\"\$as_me:17845: $lt_compile\"" >&5)
     17837   (eval echo "\"\$as_me:17837: $lt_compile\"" >&5)
    1784617838   (eval "$lt_compile" 2>conftest.err)
    1784717839   ac_status=$?
    1784817840   cat conftest.err >&5
    17849    echo "$as_me:17849: \$? = $ac_status" >&5
     17841   echo "$as_me:17841: \$? = $ac_status" >&5
    1785017842   if (exit $ac_status) && test -s "$ac_outfile"; then
    1785117843     # The compiler can only warn and ignore the option if not recognized
     
    1794717939   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1794817940   -e 's:$: $lt_compiler_flag:'`
    17949    (eval echo "\"\$as_me:17949: $lt_compile\"" >&5)
     17941   (eval echo "\"\$as_me:17941: $lt_compile\"" >&5)
    1795017942   (eval "$lt_compile" 2>out/conftest.err)
    1795117943   ac_status=$?
    1795217944   cat out/conftest.err >&5
    17953    echo "$as_me:17953: \$? = $ac_status" >&5
     17945   echo "$as_me:17945: \$? = $ac_status" >&5
    1795417946   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1795517947   then
     
    2348823480cat >&5 <<_CSEOF
    2348923481
    23490 This file was extended by Cbc $as_me 2.8.8, which was
     23482This file was extended by Cbc $as_me 2.8.7, which was
    2349123483generated by GNU Autoconf 2.59.  Invocation command line was
    2349223484
     
    2354623538cat >>$CONFIG_STATUS <<_ACEOF
    2354723539ac_cs_version="\\
    23548 Cbc config.status 2.8.8
     23540Cbc config.status 2.8.7
    2354923541configured by $0, generated by GNU Autoconf 2.59,
    2355023542  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/2.8.7/configure.ac

    r2366 r2366  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.8.8],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[2.8.7],[cbc@lists.coin-or.org])
    1616
    1717AC_COPYRIGHT([
Note: See TracChangeset for help on using the changeset viewer.