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


Ignore:
Location:
releases/2.8.8
Files:
5 added
14 edited

Legend:

Unmodified
Added
Removed
  • releases/2.8.8/Cbc

  • releases/2.8.8/Cbc/Makefile.am

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

    r2343 r2343  
    100100ETAGS = etags
    101101CTAGS = ctags
    102 DIST_SUBDIRS = src test
     102DIST_SUBDIRS = src src/OsiCbc test
    103103DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    104104distdir = $(PACKAGE)-$(VERSION)
     
    439439#                          Subdirectories                              #
    440440########################################################################
    441 SUBDIRS = src $(am__append_1)
     441
     442# Don't do src/OsiCbc recursively, since src/OsiCbc/libOsiCbc depends on src/libCbc
     443SUBDIRS = src src/OsiCbc $(am__append_1)
    442444
    443445########################################################################
     
    982984@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
    983985@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
    984 @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lCbc @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
    985987
    986988uninstall-hook:
  • releases/2.8.8/Cbc/configure

    r2343 r2343  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Cbc 2.8.7.
     3# Generated by GNU Autoconf 2.59 for Cbc 2.8.8.
    44#
    55# Report bugs to <cbc@lists.coin-or.org>.
     
    430430PACKAGE_NAME='Cbc'
    431431PACKAGE_TARNAME='cbc'
    432 PACKAGE_VERSION='2.8.7'
    433 PACKAGE_STRING='Cbc 2.8.7'
     432PACKAGE_VERSION='2.8.8'
     433PACKAGE_STRING='Cbc 2.8.8'
    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.7 to adapt to many kinds of systems.
     1008\`configure' configures Cbc 2.8.8 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.7:";;
     1074     short | recursive ) echo "Configuration of Cbc 2.8.8:";;
    10751075   esac
    10761076  cat <<\_ACEOF
     
    13061306if $ac_init_version; then
    13071307  cat <<\_ACEOF
    1308 Cbc configure 2.8.7
     1308Cbc configure 2.8.8
    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.7, which was
     1328It was created by Cbc $as_me 2.8.8, 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:7:8
     1854 coin_libversion=11:8:8
    18551855
    18561856
     
    41654165      coin_disable_shared=yes
    41664166      if test x"$enable_shared" = xyes; then
    4167         case "$CXX" in
     4167        case "$CC" 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
     4181echo "$as_me: WARNING: To build shared libraries with gcc on CYGWIN or MSys, use --enable-dependency-linking" >&2;}
     4182            fi
    41754183            ;;
    41764184          *)
     
    46074615# Define the identity of the package.
    46084616 PACKAGE='cbc'
    4609  VERSION='2.8.7'
     4617 VERSION='2.8.8'
    46104618
    46114619
     
    59035911*-*-irix6*)
    59045912  # Find out which ABI we are using.
    5905   echo '#line 5905 "configure"' > conftest.$ac_ext
     5913  echo '#line 5913 "configure"' > conftest.$ac_ext
    59065914  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    59075915  (eval $ac_compile) 2>&5
     
    70377045
    70387046# Provide some information about the compiler.
    7039 echo "$as_me:7039:" \
     7047echo "$as_me:7047:" \
    70407048     "checking for Fortran 77 compiler version" >&5
    70417049ac_compiler=`set X $ac_compile; echo $2`
     
    81048112   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81058113   -e 's:$: $lt_compiler_flag:'`
    8106    (eval echo "\"\$as_me:8106: $lt_compile\"" >&5)
     8114   (eval echo "\"\$as_me:8114: $lt_compile\"" >&5)
    81078115   (eval "$lt_compile" 2>conftest.err)
    81088116   ac_status=$?
    81098117   cat conftest.err >&5
    8110    echo "$as_me:8110: \$? = $ac_status" >&5
     8118   echo "$as_me:8118: \$? = $ac_status" >&5
    81118119   if (exit $ac_status) && test -s "$ac_outfile"; then
    81128120     # The compiler can only warn and ignore the option if not recognized
     
    83728380   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83738381   -e 's:$: $lt_compiler_flag:'`
    8374    (eval echo "\"\$as_me:8374: $lt_compile\"" >&5)
     8382   (eval echo "\"\$as_me:8382: $lt_compile\"" >&5)
    83758383   (eval "$lt_compile" 2>conftest.err)
    83768384   ac_status=$?
    83778385   cat conftest.err >&5
    8378    echo "$as_me:8378: \$? = $ac_status" >&5
     8386   echo "$as_me:8386: \$? = $ac_status" >&5
    83798387   if (exit $ac_status) && test -s "$ac_outfile"; then
    83808388     # The compiler can only warn and ignore the option if not recognized
     
    84768484   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84778485   -e 's:$: $lt_compiler_flag:'`
    8478    (eval echo "\"\$as_me:8478: $lt_compile\"" >&5)
     8486   (eval echo "\"\$as_me:8486: $lt_compile\"" >&5)
    84798487   (eval "$lt_compile" 2>out/conftest.err)
    84808488   ac_status=$?
    84818489   cat out/conftest.err >&5
    8482    echo "$as_me:8482: \$? = $ac_status" >&5
     8490   echo "$as_me:8490: \$? = $ac_status" >&5
    84838491   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84848492   then
     
    1082110829  lt_status=$lt_dlunknown
    1082210830  cat > conftest.$ac_ext <<EOF
    10823 #line 10823 "configure"
     10831#line 10831 "configure"
    1082410832#include "confdefs.h"
    1082510833
     
    1092110929  lt_status=$lt_dlunknown
    1092210930  cat > conftest.$ac_ext <<EOF
    10923 #line 10923 "configure"
     10931#line 10931 "configure"
    1092410932#include "confdefs.h"
    1092510933
     
    1326513273   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1326613274   -e 's:$: $lt_compiler_flag:'`
    13267    (eval echo "\"\$as_me:13267: $lt_compile\"" >&5)
     13275   (eval echo "\"\$as_me:13275: $lt_compile\"" >&5)
    1326813276   (eval "$lt_compile" 2>conftest.err)
    1326913277   ac_status=$?
    1327013278   cat conftest.err >&5
    13271    echo "$as_me:13271: \$? = $ac_status" >&5
     13279   echo "$as_me:13279: \$? = $ac_status" >&5
    1327213280   if (exit $ac_status) && test -s "$ac_outfile"; then
    1327313281     # The compiler can only warn and ignore the option if not recognized
     
    1336913377   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1337013378   -e 's:$: $lt_compiler_flag:'`
    13371    (eval echo "\"\$as_me:13371: $lt_compile\"" >&5)
     13379   (eval echo "\"\$as_me:13379: $lt_compile\"" >&5)
    1337213380   (eval "$lt_compile" 2>out/conftest.err)
    1337313381   ac_status=$?
    1337413382   cat out/conftest.err >&5
    13375    echo "$as_me:13375: \$? = $ac_status" >&5
     13383   echo "$as_me:13383: \$? = $ac_status" >&5
    1337613384   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1337713385   then
     
    1493914947   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1494014948   -e 's:$: $lt_compiler_flag:'`
    14941    (eval echo "\"\$as_me:14941: $lt_compile\"" >&5)
     14949   (eval echo "\"\$as_me:14949: $lt_compile\"" >&5)
    1494214950   (eval "$lt_compile" 2>conftest.err)
    1494314951   ac_status=$?
    1494414952   cat conftest.err >&5
    14945    echo "$as_me:14945: \$? = $ac_status" >&5
     14953   echo "$as_me:14953: \$? = $ac_status" >&5
    1494614954   if (exit $ac_status) && test -s "$ac_outfile"; then
    1494714955     # The compiler can only warn and ignore the option if not recognized
     
    1504315051   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1504415052   -e 's:$: $lt_compiler_flag:'`
    15045    (eval echo "\"\$as_me:15045: $lt_compile\"" >&5)
     15053   (eval echo "\"\$as_me:15053: $lt_compile\"" >&5)
    1504615054   (eval "$lt_compile" 2>out/conftest.err)
    1504715055   ac_status=$?
    1504815056   cat out/conftest.err >&5
    15049    echo "$as_me:15049: \$? = $ac_status" >&5
     15057   echo "$as_me:15057: \$? = $ac_status" >&5
    1505015058   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1505115059   then
     
    1725017258   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1725117259   -e 's:$: $lt_compiler_flag:'`
    17252    (eval echo "\"\$as_me:17252: $lt_compile\"" >&5)
     17260   (eval echo "\"\$as_me:17260: $lt_compile\"" >&5)
    1725317261   (eval "$lt_compile" 2>conftest.err)
    1725417262   ac_status=$?
    1725517263   cat conftest.err >&5
    17256    echo "$as_me:17256: \$? = $ac_status" >&5
     17264   echo "$as_me:17264: \$? = $ac_status" >&5
    1725717265   if (exit $ac_status) && test -s "$ac_outfile"; then
    1725817266     # The compiler can only warn and ignore the option if not recognized
     
    1751817526   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1751917527   -e 's:$: $lt_compiler_flag:'`
    17520    (eval echo "\"\$as_me:17520: $lt_compile\"" >&5)
     17528   (eval echo "\"\$as_me:17528: $lt_compile\"" >&5)
    1752117529   (eval "$lt_compile" 2>conftest.err)
    1752217530   ac_status=$?
    1752317531   cat conftest.err >&5
    17524    echo "$as_me:17524: \$? = $ac_status" >&5
     17532   echo "$as_me:17532: \$? = $ac_status" >&5
    1752517533   if (exit $ac_status) && test -s "$ac_outfile"; then
    1752617534     # The compiler can only warn and ignore the option if not recognized
     
    1762217630   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1762317631   -e 's:$: $lt_compiler_flag:'`
    17624    (eval echo "\"\$as_me:17624: $lt_compile\"" >&5)
     17632   (eval echo "\"\$as_me:17632: $lt_compile\"" >&5)
    1762517633   (eval "$lt_compile" 2>out/conftest.err)
    1762617634   ac_status=$?
    1762717635   cat out/conftest.err >&5
    17628    echo "$as_me:17628: \$? = $ac_status" >&5
     17636   echo "$as_me:17636: \$? = $ac_status" >&5
    1762917637   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1763017638   then
     
    3119231200cat >&5 <<_CSEOF
    3119331201
    31194 This file was extended by Cbc $as_me 2.8.7, which was
     31202This file was extended by Cbc $as_me 2.8.8, which was
    3119531203generated by GNU Autoconf 2.59.  Invocation command line was
    3119631204
     
    3125531263cat >>$CONFIG_STATUS <<_ACEOF
    3125631264ac_cs_version="\\
    31257 Cbc config.status 2.8.7
     31265Cbc config.status 2.8.8
    3125831266configured by $0, generated by GNU Autoconf 2.59,
    3125931267  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/2.8.8/Cbc/configure.ac

    r2343 r2343  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.8.7],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[2.8.8],[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:7:8)
     44AC_COIN_PROJECTDIR_INIT(Cbc,11:8:8)
    4545
    4646# Check if user wants to produce debugging code
  • releases/2.8.8/Cbc/src/CbcEventHandler.hpp

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

    r2343 r2343  
    88
    99AUTOMAKE_OPTIONS = foreign
    10 
    11 SUBDIRS = OsiCbc
    1210
    1311########################################################################
     
    103101        CbcMipStartIO.cpp CbcMipStartIO.hpp \
    104102        CbcSolverExpandKnapsack.cpp CbcSolverExpandKnapsack.hpp
     103
     104# List all additionally required libraries
     105if DEPENDENCY_LINKING
     106libCbc_la_LIBADD = $(CBCLIB_LIBS)
     107libCbcSolver_la_LIBADD = $(CBCLIB_LIBS) libCbc.la
     108endif
    105109
    106110# This is for libtool
     
    268272        test -s cbc.exe.manifest && \
    269273        mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
    270         cp cbc.exe $(bindir)/clp.exe
     274        cp cbc.exe $(bindir)/cbc.exe
    271275endif
    272276
  • releases/2.8.8/Cbc/src/Makefile.in

    r2343 r2343  
    8989libLTLIBRARIES_INSTALL = $(INSTALL)
    9090LTLIBRARIES = $(lib_LTLIBRARIES)
    91 libCbc_la_LIBADD =
     91am__DEPENDENCIES_1 =
     92@DEPENDENCY_LINKING_TRUE@libCbc_la_DEPENDENCIES =  \
     93@DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1)
    9294am_libCbc_la_OBJECTS = Cbc_C_Interface.lo CbcBranchAllDifferent.lo \
    9395        CbcBranchCut.lo CbcBranchDecision.lo \
     
    116118        CbcTreeLocal.lo
    117119libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS)
    118 libCbcSolver_la_LIBADD =
     120@DEPENDENCY_LINKING_TRUE@libCbcSolver_la_DEPENDENCIES =  \
     121@DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1) libCbc.la
    119122am_libCbcSolver_la_OBJECTS = CbcCbcParam.lo Cbc_ampl.lo CbcLinked.lo \
    120123        CbcLinkedUtils.lo unitTestClp.lo CbcSolver.lo \
     
    129132@COIN_HAS_CLP_TRUE@am_cbc_OBJECTS = CoinSolve.$(OBJEXT)
    130133cbc_OBJECTS = $(am_cbc_OBJECTS)
    131 am__DEPENDENCIES_1 =
    132134am__cbc_generic_SOURCES_DIST = CbcGenBaB.cpp CbcGenCbcParam.cpp \
    133135        CbcGenCbcParam.hpp CbcGenCbcParamUtils.cpp CbcGenCtlBlk.cpp \
     
    172174DIST_SOURCES = $(libCbc_la_SOURCES) $(libCbcSolver_la_SOURCES) \
    173175        $(am__cbc_SOURCES_DIST) $(am__cbc_generic_SOURCES_DIST)
    174 RECURSIVE_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
    180176includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
    181177HEADERS = $(includecoin_HEADERS)
    182178ETAGS = etags
    183179CTAGS = ctags
    184 DIST_SUBDIRS = $(SUBDIRS)
    185180DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    186181ABSBUILDDIR = @ABSBUILDDIR@
     
    507502target_alias = @target_alias@
    508503AUTOMAKE_OPTIONS = foreign
    509 SUBDIRS = OsiCbc
    510504
    511505########################################################################
     
    602596        CbcSolverExpandKnapsack.cpp CbcSolverExpandKnapsack.hpp
    603597
     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
    604602
    605603# This is for libtool
     
    723721
    724722all: config.h config_cbc.h
    725         $(MAKE) $(AM_MAKEFLAGS) all-recursive
     723        $(MAKE) $(AM_MAKEFLAGS) all-am
    726724
    727725.SUFFIXES:
     
    990988        done
    991989
    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 
    1023 mostlyclean-recursive clean-recursive distclean-recursive \
    1024 maintainer-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"
    1054 tags-recursive:
    1055         list='$(SUBDIRS)'; for subdir in $$list; do \
    1056           test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
    1057         done
    1058 ctags-recursive:
    1059         list='$(SUBDIRS)'; for subdir in $$list; do \
    1060           test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
    1061         done
    1062 
    1063990ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
    1064991        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     
    1071998tags: TAGS
    1072999
    1073 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \
     1000TAGS: $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \
    10741001                $(TAGS_FILES) $(LISP)
    10751002        tags=; \
    10761003        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; \
    10901004        list='$(SOURCES) $(HEADERS) config.h.in config_cbc.h.in $(LISP) $(TAGS_FILES)'; \
    10911005        unique=`for i in $$list; do \
     
    11001014        fi
    11011015ctags: CTAGS
    1102 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \
     1016CTAGS: $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \
    11031017                $(TAGS_FILES) $(LISP)
    11041018        tags=; \
     
    11491063          fi; \
    11501064        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
    11661065check-am: all-am
    1167 check: check-recursive
     1066check: check-am
    11681067all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) config.h \
    11691068                config_cbc.h
    11701069install-binPROGRAMS: install-libLTLIBRARIES
    11711070
    1172 installdirs: installdirs-recursive
    1173 installdirs-am:
     1071installdirs:
    11741072        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
    11751073          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    11761074        done
    1177 install: install-recursive
    1178 install-exec: install-exec-recursive
    1179 install-data: install-data-recursive
    1180 uninstall: uninstall-recursive
     1075install: install-am
     1076install-exec: install-exec-am
     1077install-data: install-data-am
     1078uninstall: uninstall-am
    11811079
    11821080install-am: all-am
    11831081        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
    11841082
    1185 installcheck: installcheck-recursive
     1083installcheck: installcheck-am
    11861084install-strip:
    11871085        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
     
    12001098        @echo "it deletes files that may require special tools to rebuild."
    12011099@COIN_CXX_IS_CL_FALSE@install-exec-hook:
    1202 clean: clean-recursive
     1100clean: clean-am
    12031101
    12041102clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
    12051103        clean-libtool mostlyclean-am
    12061104
    1207 distclean: distclean-recursive
     1105distclean: distclean-am
    12081106        -rm -rf ./$(DEPDIR)
    12091107        -rm -f Makefile
     
    12111109        distclean-hdr distclean-libtool distclean-tags
    12121110
    1213 dvi: dvi-recursive
     1111dvi: dvi-am
    12141112
    12151113dvi-am:
    12161114
    1217 html: html-recursive
    1218 
    1219 info: info-recursive
     1115html: html-am
     1116
     1117info: info-am
    12201118
    12211119info-am:
     
    12281126        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
    12291127
    1230 install-info: install-info-recursive
     1128install-info: install-info-am
    12311129
    12321130install-man:
     
    12341132installcheck-am:
    12351133
    1236 maintainer-clean: maintainer-clean-recursive
     1134maintainer-clean: maintainer-clean-am
    12371135        -rm -rf ./$(DEPDIR)
    12381136        -rm -f Makefile
    12391137maintainer-clean-am: distclean-am maintainer-clean-generic
    12401138
    1241 mostlyclean: mostlyclean-recursive
     1139mostlyclean: mostlyclean-am
    12421140
    12431141mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    12441142        mostlyclean-libtool
    12451143
    1246 pdf: pdf-recursive
     1144pdf: pdf-am
    12471145
    12481146pdf-am:
    12491147
    1250 ps: ps-recursive
     1148ps: ps-am
    12511149
    12521150ps-am:
     
    12551153        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    12561154
    1257 uninstall-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 \
     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 \
    12671162        install-includecoinHEADERS install-info install-info-am \
    12681163        install-libLTLIBRARIES install-man install-strip installcheck \
    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
     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
    12761170
    12771171
     
    12831177@COIN_CXX_IS_CL_TRUE@   test -s cbc.exe.manifest && \
    12841178@COIN_CXX_IS_CL_TRUE@   mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
    1285 @COIN_CXX_IS_CL_TRUE@   cp cbc.exe $(bindir)/clp.exe
     1179@COIN_CXX_IS_CL_TRUE@   cp cbc.exe $(bindir)/cbc.exe
    12861180
    12871181#######################################################################
  • releases/2.8.8/Cbc/src/OsiCbc/Makefile.am

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

    r2343 r2343  
    7575libLTLIBRARIES_INSTALL = $(INSTALL)
    7676LTLIBRARIES = $(lib_LTLIBRARIES)
    77 libOsiCbc_la_LIBADD =
     77am__DEPENDENCIES_1 =
     78@DEPENDENCY_LINKING_TRUE@libOsiCbc_la_DEPENDENCIES =  \
     79@DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1) ../libCbc.la
    7880am_libOsiCbc_la_OBJECTS = OsiCbcSolverInterface.lo
    7981libOsiCbc_la_OBJECTS = $(am_libOsiCbc_la_OBJECTS)
     
    437439libOsiCbc_la_SOURCES = OsiCbcSolverInterface.cpp OsiCbcSolverInterface.hpp
    438440
     441# List all additionally required libraries
     442@DEPENDENCY_LINKING_TRUE@libOsiCbc_la_LIBADD = $(CBCLIB_LIBS) ../libCbc.la
     443
    439444# This is for libtool (on Windows)
    440445libOsiCbc_la_LDFLAGS = $(LT_LDFLAGS)
  • releases/2.8.8/Cbc/src/config_cbc_default.h

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

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

    r2343 r2343  
    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.7.
     4# Generated by GNU Autoconf 2.59 for Cbc 2.8.8.
    55#
    66# Report bugs to <cbc@lists.coin-or.org>.
     
    431431PACKAGE_NAME='Cbc'
    432432PACKAGE_TARNAME='cbc'
    433 PACKAGE_VERSION='2.8.7'
    434 PACKAGE_STRING='Cbc 2.8.7'
     433PACKAGE_VERSION='2.8.8'
     434PACKAGE_STRING='Cbc 2.8.8'
    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.7 to adapt to many kinds of systems.
     1041\`configure' configures Cbc 2.8.8 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.7:";;
     1107     short | recursive ) echo "Configuration of Cbc 2.8.8:";;
    11081108   esac
    11091109  cat <<\_ACEOF
     
    13281328if $ac_init_version; then
    13291329  cat <<\_ACEOF
    1330 Cbc configure 2.8.7
     1330Cbc configure 2.8.8
    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.7, which was
     1350It was created by Cbc $as_me 2.8.8, 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 "$CXX" in
     4721        case "$CC" 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
     4735echo "$as_me: WARNING: To build shared libraries with gcc on CYGWIN or MSys, use --enable-dependency-linking" >&2;}
     4736            fi
    47294737            ;;
    47304738          *)
     
    51615169# Define the identity of the package.
    51625170 PACKAGE='cbc'
    5163  VERSION='2.8.7'
     5171 VERSION='2.8.8'
    51645172
    51655173
     
    64576465*-*-irix6*)
    64586466  # Find out which ABI we are using.
    6459   echo '#line 6459 "configure"' > conftest.$ac_ext
     6467  echo '#line 6467 "configure"' > conftest.$ac_ext
    64606468  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    64616469  (eval $ac_compile) 2>&5
     
    84218429   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84228430   -e 's:$: $lt_compiler_flag:'`
    8423    (eval echo "\"\$as_me:8423: $lt_compile\"" >&5)
     8431   (eval echo "\"\$as_me:8431: $lt_compile\"" >&5)
    84248432   (eval "$lt_compile" 2>conftest.err)
    84258433   ac_status=$?
    84268434   cat conftest.err >&5
    8427    echo "$as_me:8427: \$? = $ac_status" >&5
     8435   echo "$as_me:8435: \$? = $ac_status" >&5
    84288436   if (exit $ac_status) && test -s "$ac_outfile"; then
    84298437     # The compiler can only warn and ignore the option if not recognized
     
    86898697   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    86908698   -e 's:$: $lt_compiler_flag:'`
    8691    (eval echo "\"\$as_me:8691: $lt_compile\"" >&5)
     8699   (eval echo "\"\$as_me:8699: $lt_compile\"" >&5)
    86928700   (eval "$lt_compile" 2>conftest.err)
    86938701   ac_status=$?
    86948702   cat conftest.err >&5
    8695    echo "$as_me:8695: \$? = $ac_status" >&5
     8703   echo "$as_me:8703: \$? = $ac_status" >&5
    86968704   if (exit $ac_status) && test -s "$ac_outfile"; then
    86978705     # The compiler can only warn and ignore the option if not recognized
     
    87938801   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    87948802   -e 's:$: $lt_compiler_flag:'`
    8795    (eval echo "\"\$as_me:8795: $lt_compile\"" >&5)
     8803   (eval echo "\"\$as_me:8803: $lt_compile\"" >&5)
    87968804   (eval "$lt_compile" 2>out/conftest.err)
    87978805   ac_status=$?
    87988806   cat out/conftest.err >&5
    8799    echo "$as_me:8799: \$? = $ac_status" >&5
     8807   echo "$as_me:8807: \$? = $ac_status" >&5
    88008808   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    88018809   then
     
    1113811146  lt_status=$lt_dlunknown
    1113911147  cat > conftest.$ac_ext <<EOF
    11140 #line 11140 "configure"
     11148#line 11148 "configure"
    1114111149#include "confdefs.h"
    1114211150
     
    1123811246  lt_status=$lt_dlunknown
    1123911247  cat > conftest.$ac_ext <<EOF
    11240 #line 11240 "configure"
     11248#line 11248 "configure"
    1124111249#include "confdefs.h"
    1124211250
     
    1358213590   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1358313591   -e 's:$: $lt_compiler_flag:'`
    13584    (eval echo "\"\$as_me:13584: $lt_compile\"" >&5)
     13592   (eval echo "\"\$as_me:13592: $lt_compile\"" >&5)
    1358513593   (eval "$lt_compile" 2>conftest.err)
    1358613594   ac_status=$?
    1358713595   cat conftest.err >&5
    13588    echo "$as_me:13588: \$? = $ac_status" >&5
     13596   echo "$as_me:13596: \$? = $ac_status" >&5
    1358913597   if (exit $ac_status) && test -s "$ac_outfile"; then
    1359013598     # The compiler can only warn and ignore the option if not recognized
     
    1368613694   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1368713695   -e 's:$: $lt_compiler_flag:'`
    13688    (eval echo "\"\$as_me:13688: $lt_compile\"" >&5)
     13696   (eval echo "\"\$as_me:13696: $lt_compile\"" >&5)
    1368913697   (eval "$lt_compile" 2>out/conftest.err)
    1369013698   ac_status=$?
    1369113699   cat out/conftest.err >&5
    13692    echo "$as_me:13692: \$? = $ac_status" >&5
     13700   echo "$as_me:13700: \$? = $ac_status" >&5
    1369313701   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1369413702   then
     
    1525615264   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1525715265   -e 's:$: $lt_compiler_flag:'`
    15258    (eval echo "\"\$as_me:15258: $lt_compile\"" >&5)
     15266   (eval echo "\"\$as_me:15266: $lt_compile\"" >&5)
    1525915267   (eval "$lt_compile" 2>conftest.err)
    1526015268   ac_status=$?
    1526115269   cat conftest.err >&5
    15262    echo "$as_me:15262: \$? = $ac_status" >&5
     15270   echo "$as_me:15270: \$? = $ac_status" >&5
    1526315271   if (exit $ac_status) && test -s "$ac_outfile"; then
    1526415272     # The compiler can only warn and ignore the option if not recognized
     
    1536015368   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1536115369   -e 's:$: $lt_compiler_flag:'`
    15362    (eval echo "\"\$as_me:15362: $lt_compile\"" >&5)
     15370   (eval echo "\"\$as_me:15370: $lt_compile\"" >&5)
    1536315371   (eval "$lt_compile" 2>out/conftest.err)
    1536415372   ac_status=$?
    1536515373   cat out/conftest.err >&5
    15366    echo "$as_me:15366: \$? = $ac_status" >&5
     15374   echo "$as_me:15374: \$? = $ac_status" >&5
    1536715375   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1536815376   then
     
    1756717575   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1756817576   -e 's:$: $lt_compiler_flag:'`
    17569    (eval echo "\"\$as_me:17569: $lt_compile\"" >&5)
     17577   (eval echo "\"\$as_me:17577: $lt_compile\"" >&5)
    1757017578   (eval "$lt_compile" 2>conftest.err)
    1757117579   ac_status=$?
    1757217580   cat conftest.err >&5
    17573    echo "$as_me:17573: \$? = $ac_status" >&5
     17581   echo "$as_me:17581: \$? = $ac_status" >&5
    1757417582   if (exit $ac_status) && test -s "$ac_outfile"; then
    1757517583     # The compiler can only warn and ignore the option if not recognized
     
    1783517843   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1783617844   -e 's:$: $lt_compiler_flag:'`
    17837    (eval echo "\"\$as_me:17837: $lt_compile\"" >&5)
     17845   (eval echo "\"\$as_me:17845: $lt_compile\"" >&5)
    1783817846   (eval "$lt_compile" 2>conftest.err)
    1783917847   ac_status=$?
    1784017848   cat conftest.err >&5
    17841    echo "$as_me:17841: \$? = $ac_status" >&5
     17849   echo "$as_me:17849: \$? = $ac_status" >&5
    1784217850   if (exit $ac_status) && test -s "$ac_outfile"; then
    1784317851     # The compiler can only warn and ignore the option if not recognized
     
    1793917947   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1794017948   -e 's:$: $lt_compiler_flag:'`
    17941    (eval echo "\"\$as_me:17941: $lt_compile\"" >&5)
     17949   (eval echo "\"\$as_me:17949: $lt_compile\"" >&5)
    1794217950   (eval "$lt_compile" 2>out/conftest.err)
    1794317951   ac_status=$?
    1794417952   cat out/conftest.err >&5
    17945    echo "$as_me:17945: \$? = $ac_status" >&5
     17953   echo "$as_me:17953: \$? = $ac_status" >&5
    1794617954   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1794717955   then
     
    2348023488cat >&5 <<_CSEOF
    2348123489
    23482 This file was extended by Cbc $as_me 2.8.7, which was
     23490This file was extended by Cbc $as_me 2.8.8, which was
    2348323491generated by GNU Autoconf 2.59.  Invocation command line was
    2348423492
     
    2353823546cat >>$CONFIG_STATUS <<_ACEOF
    2353923547ac_cs_version="\\
    23540 Cbc config.status 2.8.7
     23548Cbc config.status 2.8.8
    2354123549configured by $0, generated by GNU Autoconf 2.59,
    2354223550  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/2.8.8/configure.ac

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