Changeset 1464 for trunk/Cbc/src


Ignore:
Timestamp:
Jun 7, 2010 8:27:42 AM (9 years ago)
Author:
stefan
Message:

merge split branch into trunk; fix some examples

Location:
trunk
Files:
23 edited
5 copied

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.5
        2 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
        3 ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        4 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        5 ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
        6 Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        7 CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        8 Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.55/Cgl
        9 Clp               https://projects.coin-or.org/svn/Clp/stable/1.12/Clp
        10 Osi               https://projects.coin-or.org/svn/Osi/stable/0.103/Osi
        11 Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/trunk
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
         6Data/Sample       https://projects.coin-or.org/svn/Data/trunk/Sample
         7#Data/miplib3      https://projects.coin-or.org/svn/Data/trunk/miplib3
         8CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
         9Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
         10Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
         11Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
         12#Vol               https://projects.coin-or.org/svn/Vol/trunk/Vol
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 1437-1439,​1444-1448,​1463
  • trunk/Cbc

  • trunk/Cbc/src/CbcCbcParam.cpp

    r1271 r1464  
    11/* $Id: CbcCbcParam.cpp 1173 2009-06-04 09:44:10Z forrest $ */
    2 #  include "../../Clp/src/CbcOrClpParam.cpp"
     2#define COIN_HAS_CBC
     3#  include "CbcOrClpParam.cpp"
    34
  • trunk/Cbc/src/CbcConfig.h

    r1461 r1464  
    9797#define CBC_VERSION "trunk"
    9898
     99/*
     100  For additional information about how to set OSICBC_DFLT_SOLVER,
     101  OSICBC_DFLT_SOLVER_CLP, and OSICBC_DFLT_SOLVER_HPP, please see comments at
     102  the beginning of OsiCbcSolverInterface.cpp. Unless you know what you're
     103  doing, you should use clp with OsiCbc. Just uncomment the next three
     104  defines.
     105*/
     106/*
     107  Define to the name of the default solver interface class, e.g.,
     108  OsiClpSolverInterface.
     109*/
     110/* #define OSICBC_DFLT_SOLVER OsiClpSolverInterface */
     111
     112/* Define this symbol if clp is the default solver. */
     113/* #define OSICBC_DFLT_SOLVER_CLP 1 */
     114
     115/*
     116  Define to the name of the .hpp file for the default solver interface class,
     117  e.g., "OsiClpSolverInterface.hpp" (include quotes)
     118*/
     119/* #define OSICBC_DFLT_SOLVER_HPP "OsiClpSolverInterface.hpp" */
     120
    99121#endif /* HAVE_CONFIG_H */
    100122
  • trunk/Cbc/src/CbcGenBaB.cpp

    • Property svn:mergeinfo deleted
  • trunk/Cbc/src/CbcGenCbcParam.cpp

    • Property svn:mergeinfo deleted
  • trunk/Cbc/src/CbcGenCbcParam.hpp

    • Property svn:mergeinfo deleted
  • trunk/Cbc/src/CbcGenCbcParamUtils.cpp

    • Property svn:mergeinfo deleted
  • trunk/Cbc/src/CbcGenCtlBlk.cpp

    • Property svn:mergeinfo deleted
  • trunk/Cbc/src/CbcGenCtlBlk.hpp

    • Property svn:mergeinfo deleted
  • trunk/Cbc/src/CbcGenMessages.cpp

    • Property svn:mergeinfo deleted
  • trunk/Cbc/src/CbcGenMessages.hpp

    • Property svn:mergeinfo deleted
  • trunk/Cbc/src/CbcGenOsiParam.cpp

    • Property svn:mergeinfo deleted
  • trunk/Cbc/src/CbcGenOsiParam.hpp

    • Property svn:mergeinfo deleted
  • trunk/Cbc/src/CbcGenOsiParamUtils.cpp

    • Property svn:mergeinfo deleted
  • trunk/Cbc/src/CbcGenParam.cpp

    • Property svn:mergeinfo deleted
  • trunk/Cbc/src/CbcGenParam.hpp

    • Property svn:mergeinfo deleted
  • trunk/Cbc/src/CbcGenParamUtils.cpp

    • Property svn:mergeinfo deleted
  • trunk/Cbc/src/CbcGenSolution.cpp

    • Property svn:mergeinfo deleted
  • trunk/Cbc/src/CbcGenSolvers.cpp

    • Property svn:mergeinfo deleted
  • trunk/Cbc/src/CbcGeneric.cpp

    • Property svn:mergeinfo deleted
  • trunk/Cbc/src/Makefile.am

    r1455 r1464  
    99AUTOMAKE_OPTIONS = foreign
    1010
     11SUBDIRS = OsiCbc
     12
    1113########################################################################
    1214#                               libCbc                                 #
     
    1517# Name of the library compiled in this directory.  We want it to be installed
    1618# in the 'lib' directory
    17 lib_LTLIBRARIES = libCbc.la libCbcSolver.la
     19coinlibdir = ${libdir}/coin
     20coinlib_LTLIBRARIES = libCbc.la libCbcSolver.la
    1821
    1922# List all source files for this library, including headers
     
    103106        CbcSolverExpandKnapsack.cpp CbcSolverExpandKnapsack.hpp
    104107
    105 #Stefan: added unitTestClp.cpp because CbcSolver defines reference to it
    106 
    107 ## If we have the Ampl solver library, we need to add additional things
    108 ## also see lower down
    109 ## new idea is to add in source code anyway
    110 ##libCbc_la_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    111 
    112 
    113108# This is for libtool (on Windows)
    114109
     
    119114
    120115bin_PROGRAMS =
    121 AM_CPPFLAGS =
    122 
    123 LIBS += `cat $(CGLOBJDIR)/cgl_addlibs.txt` \
    124         `cat $(OSIOBJDIR)/osi_addlibs.txt` \
    125         `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
    126 
     116AM_CPPFLAGS = $(COINDEPEND_CFLAGS)
    127117
    128118########################################################################
     
    137127
    138128# List all source files for this executable, including headers
    139 cbc_SOURCES = \
    140         CoinSolve.cpp
     129cbc_SOURCES = CoinSolve.cpp
    141130
    142131# Additional COIN libraries
    143 cbc_LDADD = libCbcSolver.la \
    144         libCbc.la \
    145         $(CGLOBJDIR)/src/libCgl.la \
    146         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    147         $(OSIOBJDIR)/src/libOsi.la \
    148         $(CLPOBJDIR)/src/libClp.la \
    149         $(COINUTILSOBJDIR)/src/libCoinUtils.la
     132cbc_LDADD = libCbcSolver.la libCbc.la $(COINDEPEND_LIBS) $(ADDLIBS)
    150133
    151134# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    156139# Add locations of include files.
    157140
    158 AM_CPPFLAGS += -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    159         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    160         -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
    161 LIBS  += `cat $(CLPOBJDIR)/clp_addlibs.txt`
     141if COIN_HAS_CLP
     142  AM_CPPFLAGS += $(CLP_CFLAGS)
     143  cbc_LDADD += $(CLP_LIBS)
     144endif
    162145
    163146if COIN_HAS_CPX
    164   AM_CPPFLAGS += -I`$(CYGPATH_W) $(CPXINCDIR)` \
    165         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    166   cbc_LDADD += $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    167 endif
    168 
    169 # If we have the Ampl solver library, we need to add additional things
     147  AM_CPPFLAGS += $(CPX_CFLAGS)
     148  cbc_LDADD += $(CPX_LIBS)
     149endif
     150
    170151if COIN_HAS_ASL
    171 #cbc_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    172 cbc_LDADD += $(ASLLIB)
    173 AM_CPPFLAGS += $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
     152  AM_CPPFLAGS += $(ASL_CFLAGS)
     153  cbc_LDADD += $(ASL_LIBS)
    174154endif
    175155
     
    201181        CbcGenSolvers.cpp
    202182
    203 cbc_generic_LDADD = libCbcSolver.la \
    204         libCbc.la \
    205         $(CGLOBJDIR)/src/libCgl.la
     183cbc_generic_LDADD = libCbcSolver.la libCbc.la $(COINDEPEND_LIBS) $(ADDLIBS)
    206184
    207185# List all additionally required solver and Osi libraries
    208186
    209187if COIN_HAS_CLP
    210   AM_CPPFLAGS += -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    211         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    212         -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
    213   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    214         $(CLPOBJDIR)/src/libClp.la
    215   LIBS  += `cat $(CLPOBJDIR)/clp_addlibs.txt`
     188  AM_CPPFLAGS += $(CLP_CFLAGS)
     189  cbc_generic_LDADD += $(CLP_LIBS)
    216190endif
    217191
    218192if COIN_HAS_CPX
    219   AM_CPPFLAGS += -I`$(CYGPATH_W) $(CPXINCDIR)` \
    220         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    221   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
     193  AM_CPPFLAGS += $(CPX_CFLAGS)
     194  cbc_generic_LDADD += $(CPX_LIBS)
    222195endif
    223196
    224197if COIN_HAS_DYLP
    225   AM_CPPFLAGS += -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/DylpStdLib` \
    226         -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/Dylp` \
    227         -I`$(CYGPATH_W) $(DYLPOBJDIR)/inc` \
    228         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiDylp`
    229   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    230         $(DYLPOBJDIR)/src/Dylp/libDylp.la
    231   LIBS += `cat $(DYLPOBJDIR)/dylp_addlibs.txt`
    232 endif
    233 
    234 if COIN_HAS_FMP
    235   AM_CPPFLAGS += -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiFmp`
    236   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
     198  AM_CPPFLAGS += $(DYLP_CFLAGS)
     199  cbc_generic_LDADD += $(DYLP_LIBS)
    237200endif
    238201
    239202if COIN_HAS_GLPK
    240   AM_CPPFLAGS += -I`$(CYGPATH_W) $(GLPKINCDIR)` \
    241         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiGlpk`
    242   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
     203  AM_CPPFLAGS += $(GLPK_CFLAGS)
     204  cbc_generic_LDADD += $(GLPK_LIBS)
    243205endif
    244206
    245207if COIN_HAS_MSK
    246   AM_CPPFLAGS += -I`$(CYGPATH_W) $(MSKINCDIR)` \
    247         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiMsk`
    248   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    249 endif
    250 
    251 if COIN_HAS_OSL
    252   AM_CPPFLAGS += -I`$(CYGPATH_W) $(OSLINCDIR)` \
    253         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
    254   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    255 endif
    256 
    257 if COIN_HAS_SPX
    258   AM_CPPFLAGS += -I`$(CYGPATH_W) $(SPXINCDIR)` \
    259         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSpx`
    260   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    261 endif
    262 
    263 if COIN_HAS_SYMPHONY
    264   AM_CPPFLAGS += -I`$(CYGPATH_W) $(SYMPHONYSRCDIR)/src` \
    265         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSym`
    266   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    267         $(SYMPHONYOBJDIR)/src/libSym.la
    268   LIBS += `cat $(SYMPHONYOBJDIR)/sym_addlibs.txt`
    269 endif
     208  AM_CPPFLAGS += $(MSK_CFLAGS)
     209  cbc_generic_LDADD += $(MSK_LIBS)
     210endif
     211
     212# if COIN_HAS_SPX
     213#   AM_CPPFLAGS += $(SPX_CFLAGS)
     214#   cbc_generic_LDADD += $(SPX_LIBS)
     215# endif
    270216
    271217if COIN_HAS_VOL
    272   AM_CPPFLAGS += -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
    273         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiVol`
    274   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    275         $(VOLOBJDIR)/src/libVol.la
    276   LIBS += `cat $(VOLOBJDIR)/vol_addlibs.txt`
     218  AM_CPPFLAGS += $(VOL_CFLAGS)
     219  cbc_generic_LDADD += $(VOL_LIBS)
    277220endif
    278221
    279222if COIN_HAS_XPR
    280   AM_CPPFLAGS += -I`$(CYGPATH_W) $(XPRINCDIR)` \
    281         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr`
    282   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
     223  AM_CPPFLAGS += $(XPR_CFLAGS)
     224  cbc_generic_LDADD += $(XPR_LIBS)
    283225endif
    284226
    285227if COIN_HAS_ASL
    286   cbc_generic_LDADD += $(ASLLIB)
    287   AM_CPPFLAGS += $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
    288 endif
    289 
    290 # Finally the Osi Coin library (many of the above need it)
    291 cbc_generic_LDADD += $(OSIOBJDIR)/src/libOsi.la \
    292         $(COINUTILSOBJDIR)/src/libCoinUtils.la
     228  AM_CPPFLAGS += $(ASL_CFLAGS)
     229  cbc_generic_LDADD += $(ASL_LIBS)
     230endif
    293231
    294232# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    303241#                            Additional flags                          #
    304242########################################################################
    305 
    306 # Here list all include flags, relative to this "srcdir" directory.  This
    307 # "cygpath" stuff is necessary to compile with native compilers on Windows.
    308 # "top_srcdir" refers to the basic directory for the main package that is
    309 # being compiled.
    310 AM_CPPFLAGS += \
    311         -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
    312         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` \
    313         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglDuplicateRow` \
    314         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglFlowCover` \
    315         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglGomory` \
    316         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglKnapsackCover` \
    317         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglMixedIntegerRounding` \
    318         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglMixedIntegerRounding2` \
    319         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglOddHole` \
    320         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglPreProcess` \
    321         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglProbing` \
    322         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglRedSplit` \
    323         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglTwomir` \
    324         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglLandP` \
    325         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglResidualCapacity` \
    326         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglZeroHalf` \
    327         -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    328         -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` \
    329         -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    330         -I`$(CYGPATH_W) $(OSIOBJDIR)/inc`
    331243
    332244# List additional defines
  • trunk/Cbc/src/Makefile.in

    r1455 r1464  
    5656
    5757# Add locations of include files.
    58 @COIN_HAS_CLP_TRUE@am__append_2 = -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    59 @COIN_HAS_CLP_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    60 @COIN_HAS_CLP_TRUE@     -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
    61 
    62 @COIN_HAS_CLP_TRUE@am__append_3 = `cat $(CLPOBJDIR)/clp_addlibs.txt`
    63 @COIN_HAS_CLP_TRUE@@COIN_HAS_CPX_TRUE@am__append_4 = -I`$(CYGPATH_W) $(CPXINCDIR)` \
    64 @COIN_HAS_CLP_TRUE@@COIN_HAS_CPX_TRUE@  -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    65 
    66 @COIN_HAS_CLP_TRUE@@COIN_HAS_CPX_TRUE@am__append_5 = $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    67 
    68 # If we have the Ampl solver library, we need to add additional things
    69 #cbc_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    70 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_6 = $(ASLLIB)
    71 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_7 = $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
     58@COIN_HAS_CLP_TRUE@am__append_2 = $(CLP_CFLAGS)
     59@COIN_HAS_CLP_TRUE@@COIN_HAS_CPX_TRUE@am__append_3 = $(CPX_CFLAGS)
     60@COIN_HAS_CLP_TRUE@@COIN_HAS_CPX_TRUE@am__append_4 = $(CPX_LIBS)
     61@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_5 = $(ASL_CFLAGS)
     62@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_6 = $(ASL_LIBS)
    7263
    7364########################################################################
     
    7768# Name of the executable compiled in this directory.  We want it to be
    7869# installed in the 'bin' directory
    79 @CBC_BUILD_CBC_GENERIC_TRUE@am__append_8 = cbc-generic
     70@CBC_BUILD_CBC_GENERIC_TRUE@am__append_7 = cbc-generic
    8071
    8172# List all additionally required solver and Osi libraries
    82 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_9 = -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    83 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    84 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
    85 
    86 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_10 = $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    87 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ $(CLPOBJDIR)/src/libClp.la
    88 
    89 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_11 = `cat $(CLPOBJDIR)/clp_addlibs.txt`
    90 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@am__append_12 = -I`$(CYGPATH_W) $(CPXINCDIR)` \
    91 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    92 
    93 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@am__append_13 = $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    94 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__append_14 = -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/DylpStdLib` \
    95 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@        -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/Dylp` \
    96 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@        -I`$(CYGPATH_W) $(DYLPOBJDIR)/inc` \
    97 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiDylp`
    98 
    99 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__append_15 = $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    100 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@        $(DYLPOBJDIR)/src/Dylp/libDylp.la
    101 
    102 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__append_16 = `cat $(DYLPOBJDIR)/dylp_addlibs.txt`
    103 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_FMP_TRUE@am__append_17 = -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiFmp`
    104 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_FMP_TRUE@am__append_18 = $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
    105 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@am__append_19 = -I`$(CYGPATH_W) $(GLPKINCDIR)` \
    106 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiGlpk`
    107 
    108 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@am__append_20 = $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
    109 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__append_21 = -I`$(CYGPATH_W) $(MSKINCDIR)` \
    110 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiMsk`
    111 
    112 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__append_22 = $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    113 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_OSL_TRUE@am__append_23 = -I`$(CYGPATH_W) $(OSLINCDIR)` \
    114 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_OSL_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
    115 
    116 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_OSL_TRUE@am__append_24 = $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    117 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SPX_TRUE@am__append_25 = -I`$(CYGPATH_W) $(SPXINCDIR)` \
    118 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SPX_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSpx`
    119 
    120 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SPX_TRUE@am__append_26 = $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    121 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@am__append_27 = -I`$(CYGPATH_W) $(SYMPHONYSRCDIR)/src` \
    122 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@    -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSym`
    123 
    124 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@am__append_28 = $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    125 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@    $(SYMPHONYOBJDIR)/src/libSym.la
    126 
    127 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@am__append_29 = `cat $(SYMPHONYOBJDIR)/sym_addlibs.txt`
    128 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_30 = -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
    129 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiVol`
    130 
    131 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_31 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    132 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@ $(VOLOBJDIR)/src/libVol.la
    133 
    134 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_32 = `cat $(VOLOBJDIR)/vol_addlibs.txt`
    135 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__append_33 = -I`$(CYGPATH_W) $(XPRINCDIR)` \
    136 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr`
    137 
    138 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__append_34 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    139 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_35 = $(ASLLIB)
    140 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_36 = $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
     73@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_8 = $(CLP_CFLAGS)
     74@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_9 = $(CLP_LIBS)
     75@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@am__append_10 = $(CPX_CFLAGS)
     76@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@am__append_11 = $(CPX_LIBS)
     77@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__append_12 = $(DYLP_CFLAGS)
     78@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__append_13 = $(DYLP_LIBS)
     79@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@am__append_14 = $(GLPK_CFLAGS)
     80@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@am__append_15 = $(GLPK_LIBS)
     81@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__append_16 = $(MSK_CFLAGS)
     82@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__append_17 = $(MSK_LIBS)
     83
     84# if COIN_HAS_SPX
     85#   AM_CPPFLAGS += $(SPX_CFLAGS)
     86#   cbc_generic_LDADD += $(SPX_LIBS)
     87# endif
     88@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_18 = $(VOL_CFLAGS)
     89@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_19 = $(VOL_LIBS)
     90@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__append_20 = $(XPR_CFLAGS)
     91@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__append_21 = $(XPR_LIBS)
     92@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_22 = $(ASL_CFLAGS)
     93@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_23 = $(ASL_LIBS)
    14194subdir = src
    14295DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
     
    156109  esac;
    157110am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    158 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
     111am__installdirs = "$(DESTDIR)$(coinlibdir)" "$(DESTDIR)$(bindir)" \
    159112        "$(DESTDIR)$(includecoindir)"
    160 libLTLIBRARIES_INSTALL = $(INSTALL)
    161 LTLIBRARIES = $(lib_LTLIBRARIES)
     113coinlibLTLIBRARIES_INSTALL = $(INSTALL)
     114LTLIBRARIES = $(coinlib_LTLIBRARIES)
    162115libCbc_la_LIBADD =
    163116am_libCbc_la_OBJECTS = Cbc_C_Interface.lo CbcBranchAllDifferent.lo \
     
    200153@COIN_HAS_CLP_TRUE@am_cbc_OBJECTS = CoinSolve.$(OBJEXT)
    201154cbc_OBJECTS = $(am_cbc_OBJECTS)
    202 @COIN_HAS_CLP_TRUE@@COIN_HAS_CPX_TRUE@am__DEPENDENCIES_1 = $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    203 am__DEPENDENCIES_2 =
     155am__DEPENDENCIES_1 =
     156@COIN_HAS_CLP_TRUE@@COIN_HAS_CPX_TRUE@am__DEPENDENCIES_2 =  \
     157@COIN_HAS_CLP_TRUE@@COIN_HAS_CPX_TRUE@  $(am__DEPENDENCIES_1)
    204158@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_3 =  \
    205 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@  $(am__DEPENDENCIES_2)
     159@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@  $(am__DEPENDENCIES_1)
    206160@COIN_HAS_CLP_TRUE@cbc_DEPENDENCIES = libCbcSolver.la libCbc.la \
    207 @COIN_HAS_CLP_TRUE@     $(CGLOBJDIR)/src/libCgl.la \
    208 @COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    209 @COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/libOsi.la \
    210 @COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la \
    211 @COIN_HAS_CLP_TRUE@     $(COINUTILSOBJDIR)/src/libCoinUtils.la \
    212 @COIN_HAS_CLP_TRUE@     $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3)
     161@COIN_HAS_CLP_TRUE@     $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
     162@COIN_HAS_CLP_TRUE@     $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
     163@COIN_HAS_CLP_TRUE@     $(am__DEPENDENCIES_3)
    213164am__cbc_generic_SOURCES_DIST = CbcGenBaB.cpp CbcGenCbcParam.cpp \
    214165        CbcGenCbcParam.hpp CbcGenCbcParamUtils.cpp CbcGenCtlBlk.cpp \
     
    231182@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenSolvers.$(OBJEXT)
    232183cbc_generic_OBJECTS = $(am_cbc_generic_OBJECTS)
    233 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_4 = $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    234 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ $(CLPOBJDIR)/src/libClp.la
    235 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@am__DEPENDENCIES_5 = $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    236 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_6 = $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    237 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@        $(DYLPOBJDIR)/src/Dylp/libDylp.la
    238 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_FMP_TRUE@am__DEPENDENCIES_7 = $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
    239 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@am__DEPENDENCIES_8 = $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
    240 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__DEPENDENCIES_9 = $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    241 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_OSL_TRUE@am__DEPENDENCIES_10 = $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    242 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SPX_TRUE@am__DEPENDENCIES_11 = $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    243 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@am__DEPENDENCIES_12 = $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    244 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@    $(SYMPHONYOBJDIR)/src/libSym.la
    245 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__DEPENDENCIES_13 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    246 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@ $(VOLOBJDIR)/src/libVol.la
    247 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_14 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    248 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_2)
     184@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
     185@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
     186@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
     187@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
     188@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
     189@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
     190@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1)
     191@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1)
    249192@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_DEPENDENCIES =  \
    250193@CBC_BUILD_CBC_GENERIC_TRUE@    libCbcSolver.la libCbc.la \
    251 @CBC_BUILD_CBC_GENERIC_TRUE@    $(CGLOBJDIR)/src/libCgl.la \
     194@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_1) \
     195@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_1) \
    252196@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_4) \
    253197@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_5) \
     
    257201@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_9) \
    258202@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_10) \
    259 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_11) \
    260 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_12) \
    261 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_13) \
    262 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_14) \
    263 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_15) \
    264 @CBC_BUILD_CBC_GENERIC_TRUE@    $(OSIOBJDIR)/src/libOsi.la \
    265 @CBC_BUILD_CBC_GENERIC_TRUE@    $(COINUTILSOBJDIR)/src/libCoinUtils.la
     203@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_11)
    266204depcomp = $(SHELL) $(top_srcdir)/../depcomp
    267205am__depfiles_maybe = depfiles
     
    286224DIST_SOURCES = $(libCbc_la_SOURCES) $(libCbcSolver_la_SOURCES) \
    287225        $(am__cbc_SOURCES_DIST) $(am__cbc_generic_SOURCES_DIST)
     226RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
     227        html-recursive info-recursive install-data-recursive \
     228        install-exec-recursive install-info-recursive \
     229        install-recursive installcheck-recursive installdirs-recursive \
     230        pdf-recursive ps-recursive uninstall-info-recursive \
     231        uninstall-recursive
    288232includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
    289233HEADERS = $(includecoin_HEADERS)
    290234ETAGS = etags
    291235CTAGS = ctags
     236DIST_SUBDIRS = $(SUBDIRS)
    292237DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
     238ABSBUILDDIR = @ABSBUILDDIR@
    293239ACLOCAL = @ACLOCAL@
    294240ADDLIBS = @ADDLIBS@
     
    301247AMTAR = @AMTAR@
    302248AR = @AR@
    303 ASLLIB = @ASLLIB@
    304 ASL_CPPFLAGS = @ASL_CPPFLAGS@
     249ASL_CFLAGS = @ASL_CFLAGS@
     250ASL_DATA = @ASL_DATA@
     251ASL_LIBS = @ASL_LIBS@
    305252AUTOCONF = @AUTOCONF@
    306253AUTOHEADER = @AUTOHEADER@
     
    309256AWK = @AWK@
    310257BUILDTOOLSDIR = @BUILDTOOLSDIR@
    311 CBCDOCDIR = @CBCDOCDIR@
    312 CBCOBJDIR = @CBCOBJDIR@
    313 CBCSRCDIR = @CBCSRCDIR@
    314258CBC_BUILD_CBC_GENERIC_FALSE = @CBC_BUILD_CBC_GENERIC_FALSE@
    315259CBC_BUILD_CBC_GENERIC_TRUE = @CBC_BUILD_CBC_GENERIC_TRUE@
     260CBC_SVN_REV = @CBC_SVN_REV@
    316261CC = @CC@
    317262CCDEPMODE = @CCDEPMODE@
    318263CDEFS = @CDEFS@
    319264CFLAGS = @CFLAGS@
    320 CGLDOCDIR = @CGLDOCDIR@
    321 CGLOBJDIR = @CGLOBJDIR@
    322 CGLSRCDIR = @CGLSRCDIR@
    323 CLPDOCDIR = @CLPDOCDIR@
    324 CLPOBJDIR = @CLPOBJDIR@
    325 CLPSRCDIR = @CLPSRCDIR@
    326 COINUTILSDOCDIR = @COINUTILSDOCDIR@
    327 COINUTILSOBJDIR = @COINUTILSOBJDIR@
    328 COINUTILSSRCDIR = @COINUTILSSRCDIR@
    329 COIN_BUILD_GLPK_FALSE = @COIN_BUILD_GLPK_FALSE@
    330 COIN_BUILD_GLPK_TRUE = @COIN_BUILD_GLPK_TRUE@
     265CLP_CFLAGS = @CLP_CFLAGS@
     266CLP_DATA = @CLP_DATA@
     267CLP_LIBS = @CLP_LIBS@
     268COINDEPEND_CFLAGS = @COINDEPEND_CFLAGS@
     269COINDEPEND_DATA = @COINDEPEND_DATA@
     270COINDEPEND_LIBS = @COINDEPEND_LIBS@
    331271COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
    332272COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
    333 COIN_HAS_CBC_FALSE = @COIN_HAS_CBC_FALSE@
    334 COIN_HAS_CBC_TRUE = @COIN_HAS_CBC_TRUE@
    335 COIN_HAS_CGL_FALSE = @COIN_HAS_CGL_FALSE@
    336 COIN_HAS_CGL_TRUE = @COIN_HAS_CGL_TRUE@
    337273COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    338274COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    339 COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
    340 COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
     275COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
     276COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
    341277COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    342278COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
    343279COIN_HAS_DYLP_FALSE = @COIN_HAS_DYLP_FALSE@
    344280COIN_HAS_DYLP_TRUE = @COIN_HAS_DYLP_TRUE@
    345 COIN_HAS_FMP_FALSE = @COIN_HAS_FMP_FALSE@
    346 COIN_HAS_FMP_TRUE = @COIN_HAS_FMP_TRUE@
    347281COIN_HAS_GLPK_FALSE = @COIN_HAS_GLPK_FALSE@
    348282COIN_HAS_GLPK_TRUE = @COIN_HAS_GLPK_TRUE@
     283COIN_HAS_GRB_FALSE = @COIN_HAS_GRB_FALSE@
     284COIN_HAS_GRB_TRUE = @COIN_HAS_GRB_TRUE@
     285COIN_HAS_MIPLIB3_FALSE = @COIN_HAS_MIPLIB3_FALSE@
     286COIN_HAS_MIPLIB3_TRUE = @COIN_HAS_MIPLIB3_TRUE@
    349287COIN_HAS_MSK_FALSE = @COIN_HAS_MSK_FALSE@
    350288COIN_HAS_MSK_TRUE = @COIN_HAS_MSK_TRUE@
    351 COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@
    352 COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@
    353 COIN_HAS_OSL_FALSE = @COIN_HAS_OSL_FALSE@
    354 COIN_HAS_OSL_TRUE = @COIN_HAS_OSL_TRUE@
    355 COIN_HAS_SPX_FALSE = @COIN_HAS_SPX_FALSE@
    356 COIN_HAS_SPX_TRUE = @COIN_HAS_SPX_TRUE@
    357 COIN_HAS_SYMPHONY_FALSE = @COIN_HAS_SYMPHONY_FALSE@
    358 COIN_HAS_SYMPHONY_TRUE = @COIN_HAS_SYMPHONY_TRUE@
     289COIN_HAS_NETLIB_FALSE = @COIN_HAS_NETLIB_FALSE@
     290COIN_HAS_NETLIB_TRUE = @COIN_HAS_NETLIB_TRUE@
     291COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@
     292COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@
     293COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
     294COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
     295COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@
     296COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
    359297COIN_HAS_VOL_FALSE = @COIN_HAS_VOL_FALSE@
    360298COIN_HAS_VOL_TRUE = @COIN_HAS_VOL_TRUE@
    361299COIN_HAS_XPR_FALSE = @COIN_HAS_XPR_FALSE@
    362300COIN_HAS_XPR_TRUE = @COIN_HAS_XPR_TRUE@
     301COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    363302CPP = @CPP@
    364303CPPFLAGS = @CPPFLAGS@
    365 CPXDOCDIR = @CPXDOCDIR@
    366 CPXINCDIR = @CPXINCDIR@
    367 CPXLIB = @CPXLIB@
    368 CPXOBJDIR = @CPXOBJDIR@
    369 CPXSRCDIR = @CPXSRCDIR@
     304CPX_CFLAGS = @CPX_CFLAGS@
     305CPX_DATA = @CPX_DATA@
     306CPX_LIBS = @CPX_LIBS@
    370307CXX = @CXX@
    371308CXXCPP = @CXXCPP@
     
    378315DEFS = @DEFS@
    379316DEPDIR = @DEPDIR@
    380 DYLPDOCDIR = @DYLPDOCDIR@
    381 DYLPOBJDIR = @DYLPOBJDIR@
    382 DYLPSRCDIR = @DYLPSRCDIR@
     317DYLP_CFLAGS = @DYLP_CFLAGS@
     318DYLP_DATA = @DYLP_DATA@
     319DYLP_LIBS = @DYLP_LIBS@
    383320ECHO = @ECHO@
    384321ECHO_C = @ECHO_C@
     
    390327FADDLIBS = @FADDLIBS@
    391328FFLAGS = @FFLAGS@
    392 FMPINCDIR = @FMPINCDIR@
    393 FMPLIB = @FMPLIB@
    394 GLPKINCDIR = @GLPKINCDIR@
    395 GLPKLIB = @GLPKLIB@
    396 GLPKOBJDIR = @GLPKOBJDIR@
     329GLPK_CFLAGS = @GLPK_CFLAGS@
     330GLPK_DATA = @GLPK_DATA@
     331GLPK_LIBS = @GLPK_LIBS@
     332GRB_CFLAGS = @GRB_CFLAGS@
     333GRB_DATA = @GRB_DATA@
     334GRB_LIBS = @GRB_LIBS@
    397335HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    398336HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
     
    404342LIBEXT = @LIBEXT@
    405343LIBOBJS = @LIBOBJS@
    406 LIBS = @LIBS@ `cat $(CGLOBJDIR)/cgl_addlibs.txt` `cat \
    407         $(OSIOBJDIR)/osi_addlibs.txt` `cat \
    408         $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS) \
    409         $(am__append_3) $(am__append_11) $(am__append_16) \
    410         $(am__append_29) $(am__append_32)
     344LIBS = @LIBS@
    411345LIBTOOL = @LIBTOOL@
    412346LIBTOOLM4 = @LIBTOOLM4@
     
    418352MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    419353MAKEINFO = @MAKEINFO@
     354MIPLIB3_CFLAGS = @MIPLIB3_CFLAGS@
     355MIPLIB3_DATA = @MIPLIB3_DATA@
     356MIPLIB3_LIBS = @MIPLIB3_LIBS@
    420357MPICC = @MPICC@
    421358MPICXX = @MPICXX@
    422 MSKINCDIR = @MSKINCDIR@
    423 MSKLIB = @MSKLIB@
     359MSK_CFLAGS = @MSK_CFLAGS@
     360MSK_DATA = @MSK_DATA@
     361MSK_LIBS = @MSK_LIBS@
     362NETLIB_CFLAGS = @NETLIB_CFLAGS@
     363NETLIB_DATA = @NETLIB_DATA@
     364NETLIB_LIBS = @NETLIB_LIBS@
    424365OBJEXT = @OBJEXT@
    425366OPT_CFLAGS = @OPT_CFLAGS@
    426367OPT_CXXFLAGS = @OPT_CXXFLAGS@
    427 OSIDOCDIR = @OSIDOCDIR@
    428 OSIOBJDIR = @OSIOBJDIR@
    429 OSISRCDIR = @OSISRCDIR@
    430 OSLINCDIR = @OSLINCDIR@
    431 OSLLIB = @OSLLIB@
     368OSICBC_DFLT_SOLVER_CLP_FALSE = @OSICBC_DFLT_SOLVER_CLP_FALSE@
     369OSICBC_DFLT_SOLVER_CLP_TRUE = @OSICBC_DFLT_SOLVER_CLP_TRUE@
     370OSICBC_DFLT_SOLVER_CPX_FALSE = @OSICBC_DFLT_SOLVER_CPX_FALSE@
     371OSICBC_DFLT_SOLVER_CPX_TRUE = @OSICBC_DFLT_SOLVER_CPX_TRUE@
     372OSICBC_DFLT_SOLVER_DYLP_FALSE = @OSICBC_DFLT_SOLVER_DYLP_FALSE@
     373OSICBC_DFLT_SOLVER_DYLP_TRUE = @OSICBC_DFLT_SOLVER_DYLP_TRUE@
     374OSICBC_DFLT_SOLVER_GLPK_FALSE = @OSICBC_DFLT_SOLVER_GLPK_FALSE@
     375OSICBC_DFLT_SOLVER_GLPK_TRUE = @OSICBC_DFLT_SOLVER_GLPK_TRUE@
     376OSICBC_DFLT_SOLVER_GRB_FALSE = @OSICBC_DFLT_SOLVER_GRB_FALSE@
     377OSICBC_DFLT_SOLVER_GRB_TRUE = @OSICBC_DFLT_SOLVER_GRB_TRUE@
     378OSICBC_DFLT_SOLVER_MSK_FALSE = @OSICBC_DFLT_SOLVER_MSK_FALSE@
     379OSICBC_DFLT_SOLVER_MSK_TRUE = @OSICBC_DFLT_SOLVER_MSK_TRUE@
     380OSICBC_DFLT_SOLVER_SYM_FALSE = @OSICBC_DFLT_SOLVER_SYM_FALSE@
     381OSICBC_DFLT_SOLVER_SYM_TRUE = @OSICBC_DFLT_SOLVER_SYM_TRUE@
     382OSICBC_DFLT_SOLVER_VOL_FALSE = @OSICBC_DFLT_SOLVER_VOL_FALSE@
     383OSICBC_DFLT_SOLVER_VOL_TRUE = @OSICBC_DFLT_SOLVER_VOL_TRUE@
     384OSICBC_DFLT_SOLVER_XPR_FALSE = @OSICBC_DFLT_SOLVER_XPR_FALSE@
     385OSICBC_DFLT_SOLVER_XPR_TRUE = @OSICBC_DFLT_SOLVER_XPR_TRUE@
     386OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
     387OSITESTS_DATA = @OSITESTS_DATA@
     388OSITESTS_LIBS = @OSITESTS_LIBS@
    432389PACKAGE = @PACKAGE@
    433390PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     
    437394PACKAGE_VERSION = @PACKAGE_VERSION@
    438395PATH_SEPARATOR = @PATH_SEPARATOR@
     396PKG_CONFIG = @PKG_CONFIG@
    439397RANLIB = @RANLIB@
     398REQUIREDPACKAGES = @REQUIREDPACKAGES@
    440399RPATH_FLAGS = @RPATH_FLAGS@
     400SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
     401SAMPLE_DATA = @SAMPLE_DATA@
     402SAMPLE_LIBS = @SAMPLE_LIBS@
    441403SET_MAKE = @SET_MAKE@
    442404SHELL = @SHELL@
    443 SPXINCDIR = @SPXINCDIR@
    444 SPXLIB = @SPXLIB@
    445405STRIP = @STRIP@
    446 SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    447 SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    448 SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    449406VERSION = @VERSION@
    450 VOLDOCDIR = @VOLDOCDIR@
    451 VOLOBJDIR = @VOLOBJDIR@
    452 VOLSRCDIR = @VOLSRCDIR@
     407VOL_CFLAGS = @VOL_CFLAGS@
     408VOL_DATA = @VOL_DATA@
     409VOL_LIBS = @VOL_LIBS@
    453410VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    454 XPRINCDIR = @XPRINCDIR@
    455 XPRLIB = @XPRLIB@
     411XPR_CFLAGS = @XPR_CFLAGS@
     412XPR_DATA = @XPR_DATA@
     413XPR_LIBS = @XPR_LIBS@
    456414abs_bin_dir = @abs_bin_dir@
    457415abs_include_dir = @abs_include_dir@
     
    466424ac_ct_STRIP = @ac_ct_STRIP@
    467425ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
     426ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    468427am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    469428am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
     
    486445have_automake = @have_automake@
    487446have_svn = @have_svn@
     447have_svnversion = @have_svnversion@
    488448host = @host@
    489449host_alias = @host_alias@
     
    508468target_alias = @target_alias@
    509469AUTOMAKE_OPTIONS = foreign
     470SUBDIRS = OsiCbc
    510471
    511472########################################################################
     
    515476# Name of the library compiled in this directory.  We want it to be installed
    516477# in the 'lib' directory
    517 lib_LTLIBRARIES = libCbc.la libCbcSolver.la
     478coinlibdir = ${libdir}/coin
     479coinlib_LTLIBRARIES = libCbc.la libCbcSolver.la
    518480
    519481# List all source files for this library, including headers
     
    603565
    604566
    605 #Stefan: added unitTestClp.cpp because CbcSolver defines reference to it
    606 
    607567# This is for libtool (on Windows)
    608568libCbc_la_LDFLAGS = $(LT_LDFLAGS)
     
    613573########################################################################
    614574
    615 # Here list all include flags, relative to this "srcdir" directory.  This
    616 # "cygpath" stuff is necessary to compile with native compilers on Windows.
    617 # "top_srcdir" refers to the basic directory for the main package that is
    618 # being compiled.
    619 
    620575# List additional defines
    621 AM_CPPFLAGS = $(am__append_2) $(am__append_4) $(am__append_7) \
    622         $(am__append_9) $(am__append_12) $(am__append_14) \
    623         $(am__append_17) $(am__append_19) $(am__append_21) \
    624         $(am__append_23) $(am__append_25) $(am__append_27) \
    625         $(am__append_30) $(am__append_33) $(am__append_36) \
    626         -I`$(CYGPATH_W) $(CGLSRCDIR)/src` -I`$(CYGPATH_W) \
    627         $(CGLSRCDIR)/src/CglClique` -I`$(CYGPATH_W) \
    628         $(CGLSRCDIR)/src/CglDuplicateRow` -I`$(CYGPATH_W) \
    629         $(CGLSRCDIR)/src/CglFlowCover` -I`$(CYGPATH_W) \
    630         $(CGLSRCDIR)/src/CglGomory` -I`$(CYGPATH_W) \
    631         $(CGLSRCDIR)/src/CglKnapsackCover` -I`$(CYGPATH_W) \
    632         $(CGLSRCDIR)/src/CglMixedIntegerRounding` -I`$(CYGPATH_W) \
    633         $(CGLSRCDIR)/src/CglMixedIntegerRounding2` -I`$(CYGPATH_W) \
    634         $(CGLSRCDIR)/src/CglOddHole` -I`$(CYGPATH_W) \
    635         $(CGLSRCDIR)/src/CglPreProcess` -I`$(CYGPATH_W) \
    636         $(CGLSRCDIR)/src/CglProbing` -I`$(CYGPATH_W) \
    637         $(CGLSRCDIR)/src/CglRedSplit` -I`$(CYGPATH_W) \
    638         $(CGLSRCDIR)/src/CglTwomir` -I`$(CYGPATH_W) \
    639         $(CGLSRCDIR)/src/CglLandP` -I`$(CYGPATH_W) \
    640         $(CGLSRCDIR)/src/CglResidualCapacity` -I`$(CYGPATH_W) \
    641         $(CGLSRCDIR)/src/CglZeroHalf` -I`$(CYGPATH_W) \
    642         $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) \
    643         $(COINUTILSOBJDIR)/inc` -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    644         -I`$(CYGPATH_W) $(OSIOBJDIR)/inc` -DCOIN_NO_CLP_MESSAGE \
    645         -DUSE_CBCCONFIG
     576AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(am__append_2) $(am__append_3) \
     577        $(am__append_5) $(am__append_8) $(am__append_10) \
     578        $(am__append_12) $(am__append_14) $(am__append_16) \
     579        $(am__append_18) $(am__append_20) $(am__append_22) \
     580        -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
    646581
    647582# List all source files for this executable, including headers
    648 @COIN_HAS_CLP_TRUE@cbc_SOURCES = \
    649 @COIN_HAS_CLP_TRUE@     CoinSolve.cpp
    650 
     583@COIN_HAS_CLP_TRUE@cbc_SOURCES = CoinSolve.cpp
    651584
    652585# Additional COIN libraries
    653586@COIN_HAS_CLP_TRUE@cbc_LDADD = libCbcSolver.la libCbc.la \
    654 @COIN_HAS_CLP_TRUE@     $(CGLOBJDIR)/src/libCgl.la \
    655 @COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    656 @COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/libOsi.la \
    657 @COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la \
    658 @COIN_HAS_CLP_TRUE@     $(COINUTILSOBJDIR)/src/libCoinUtils.la \
    659 @COIN_HAS_CLP_TRUE@     $(am__append_5) $(am__append_6)
     587@COIN_HAS_CLP_TRUE@     $(COINDEPEND_LIBS) $(ADDLIBS) $(CLP_LIBS) \
     588@COIN_HAS_CLP_TRUE@     $(am__append_4) $(am__append_6)
    660589
    661590# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    676605@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenSolvers.cpp
    677606
    678 
    679 # Finally the Osi Coin library (many of the above need it)
    680607@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_LDADD = libCbcSolver.la \
    681 @CBC_BUILD_CBC_GENERIC_TRUE@    libCbc.la \
    682 @CBC_BUILD_CBC_GENERIC_TRUE@    $(CGLOBJDIR)/src/libCgl.la \
    683 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_10) $(am__append_13) \
    684 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_15) $(am__append_18) \
    685 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_20) $(am__append_22) \
    686 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_24) $(am__append_26) \
    687 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_28) $(am__append_31) \
    688 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_34) $(am__append_35) \
    689 @CBC_BUILD_CBC_GENERIC_TRUE@    $(OSIOBJDIR)/src/libOsi.la \
    690 @CBC_BUILD_CBC_GENERIC_TRUE@    $(COINUTILSOBJDIR)/src/libCoinUtils.la
     608@CBC_BUILD_CBC_GENERIC_TRUE@    libCbc.la $(COINDEPEND_LIBS) \
     609@CBC_BUILD_CBC_GENERIC_TRUE@    $(ADDLIBS) $(am__append_9) \
     610@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_11) $(am__append_13) \
     611@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_15) $(am__append_17) \
     612@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_19) $(am__append_21) \
     613@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_23)
    691614
    692615# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    786709# You only need to adapt the following line
    787710ConfigHeader = CbcConfig.h
    788 all: all-am
     711all: all-recursive
    789712
    790713.SUFFIXES:
     
    819742$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    820743        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    821 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
     744install-coinlibLTLIBRARIES: $(coinlib_LTLIBRARIES)
    822745        @$(NORMAL_INSTALL)
    823         test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
    824         @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
     746        test -z "$(coinlibdir)" || $(mkdir_p) "$(DESTDIR)$(coinlibdir)"
     747        @list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
    825748          if test -f $$p; then \
    826749            f=$(am__strip_dir) \
    827             echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
    828             $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
     750            echo " $(LIBTOOL) --mode=install $(coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(coinlibdir)/$$f'"; \
     751            $(LIBTOOL) --mode=install $(coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(coinlibdir)/$$f"; \
    829752          else :; fi; \
    830753        done
    831754
    832 uninstall-libLTLIBRARIES:
     755uninstall-coinlibLTLIBRARIES:
    833756        @$(NORMAL_UNINSTALL)
    834         @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
     757        @set -x; list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
    835758          p=$(am__strip_dir) \
    836           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
    837           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
     759          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(coinlibdir)/$$p'"; \
     760          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(coinlibdir)/$$p"; \
    838761        done
    839762
    840 clean-libLTLIBRARIES:
    841         -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
    842         @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
     763clean-coinlibLTLIBRARIES:
     764        -test -z "$(coinlib_LTLIBRARIES)" || rm -f $(coinlib_LTLIBRARIES)
     765        @list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
    843766          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    844767          test "$$dir" != "$$p" || dir=.; \
     
    847770        done
    848771libCbc.la: $(libCbc_la_OBJECTS) $(libCbc_la_DEPENDENCIES)
    849         $(CXXLINK) -rpath $(libdir) $(libCbc_la_LDFLAGS) $(libCbc_la_OBJECTS) $(libCbc_la_LIBADD) $(LIBS)
     772        $(CXXLINK) -rpath $(coinlibdir) $(libCbc_la_LDFLAGS) $(libCbc_la_OBJECTS) $(libCbc_la_LIBADD) $(LIBS)
    850773libCbcSolver.la: $(libCbcSolver_la_OBJECTS) $(libCbcSolver_la_DEPENDENCIES)
    851         $(CXXLINK) -rpath $(libdir) $(libCbcSolver_la_LDFLAGS) $(libCbcSolver_la_OBJECTS) $(libCbcSolver_la_LIBADD) $(LIBS)
     774        $(CXXLINK) -rpath $(coinlibdir) $(libCbcSolver_la_LDFLAGS) $(libCbcSolver_la_OBJECTS) $(libCbcSolver_la_LIBADD) $(LIBS)
    852775install-binPROGRAMS: $(bin_PROGRAMS)
    853776        @$(NORMAL_INSTALL)
     
    1025948        done
    1026949
     950# This directory's subdirectories are mostly independent; you can cd
     951# into them and run `make' without going through this Makefile.
     952# To change the values of `make' variables: instead of editing Makefiles,
     953# (1) if the variable is set in `config.status', edit `config.status'
     954#     (which will cause the Makefiles to be regenerated when you run `make');
     955# (2) otherwise, pass the desired values on the `make' command line.
     956$(RECURSIVE_TARGETS):
     957        @failcom='exit 1'; \
     958        for f in x $$MAKEFLAGS; do \
     959          case $$f in \
     960            *=* | --[!k]*);; \
     961            *k*) failcom='fail=yes';; \
     962          esac; \
     963        done; \
     964        dot_seen=no; \
     965        target=`echo $@ | sed s/-recursive//`; \
     966        list='$(SUBDIRS)'; for subdir in $$list; do \
     967          echo "Making $$target in $$subdir"; \
     968          if test "$$subdir" = "."; then \
     969            dot_seen=yes; \
     970            local_target="$$target-am"; \
     971          else \
     972            local_target="$$target"; \
     973          fi; \
     974          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
     975          || eval $$failcom; \
     976        done; \
     977        if test "$$dot_seen" = "no"; then \
     978          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
     979        fi; test -z "$$fail"
     980
     981mostlyclean-recursive clean-recursive distclean-recursive \
     982maintainer-clean-recursive:
     983        @failcom='exit 1'; \
     984        for f in x $$MAKEFLAGS; do \
     985          case $$f in \
     986            *=* | --[!k]*);; \
     987            *k*) failcom='fail=yes';; \
     988          esac; \
     989        done; \
     990        dot_seen=no; \
     991        case "$@" in \
     992          distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
     993          *) list='$(SUBDIRS)' ;; \
     994        esac; \
     995        rev=''; for subdir in $$list; do \
     996          if test "$$subdir" = "."; then :; else \
     997            rev="$$subdir $$rev"; \
     998          fi; \
     999        done; \
     1000        rev="$$rev ."; \
     1001        target=`echo $@ | sed s/-recursive//`; \
     1002        for subdir in $$rev; do \
     1003          echo "Making $$target in $$subdir"; \
     1004          if test "$$subdir" = "."; then \
     1005            local_target="$$target-am"; \
     1006          else \
     1007            local_target="$$target"; \
     1008          fi; \
     1009          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
     1010          || eval $$failcom; \
     1011        done && test -z "$$fail"
     1012tags-recursive:
     1013        list='$(SUBDIRS)'; for subdir in $$list; do \
     1014          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
     1015        done
     1016ctags-recursive:
     1017        list='$(SUBDIRS)'; for subdir in $$list; do \
     1018          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
     1019        done
     1020
    10271021ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
    10281022        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     
    10351029tags: TAGS
    10361030
    1037 TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
     1031TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    10381032                $(TAGS_FILES) $(LISP)
    10391033        tags=; \
    10401034        here=`pwd`; \
     1035        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
     1036          include_option=--etags-include; \
     1037          empty_fix=.; \
     1038        else \
     1039          include_option=--include; \
     1040          empty_fix=; \
     1041        fi; \
     1042        list='$(SUBDIRS)'; for subdir in $$list; do \
     1043          if test "$$subdir" = .; then :; else \
     1044            test ! -f $$subdir/TAGS || \
     1045              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
     1046          fi; \
     1047        done; \
    10411048        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
    10421049        unique=`for i in $$list; do \
     
    10511058        fi
    10521059ctags: CTAGS
    1053 CTAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
     1060CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    10541061                $(TAGS_FILES) $(LISP)
    10551062        tags=; \
     
    11011108          fi; \
    11021109        done
     1110        list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
     1111          if test "$$subdir" = .; then :; else \
     1112            test -d "$(distdir)/$$subdir" \
     1113            || $(mkdir_p) "$(distdir)/$$subdir" \
     1114            || exit 1; \
     1115            distdir=`$(am__cd) $(distdir) && pwd`; \
     1116            top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
     1117            (cd $$subdir && \
     1118              $(MAKE) $(AM_MAKEFLAGS) \
     1119                top_distdir="$$top_distdir" \
     1120                distdir="$$distdir/$$subdir" \
     1121                distdir) \
     1122              || exit 1; \
     1123          fi; \
     1124        done
    11031125check-am: all-am
    1104 check: check-am
     1126check: check-recursive
    11051127all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
    1106 install-binPROGRAMS: install-libLTLIBRARIES
    1107 
    1108 installdirs:
    1109         for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
     1128installdirs: installdirs-recursive
     1129installdirs-am:
     1130        for dir in "$(DESTDIR)$(coinlibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
    11101131          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    11111132        done
    1112 install: install-am
    1113 install-exec: install-exec-am
    1114 install-data: install-data-am
    1115 uninstall: uninstall-am
     1133install: install-recursive
     1134install-exec: install-exec-recursive
     1135install-data: install-data-recursive
     1136uninstall: uninstall-recursive
    11161137
    11171138install-am: all-am
    11181139        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
    11191140
    1120 installcheck: installcheck-am
     1141installcheck: installcheck-recursive
    11211142install-strip:
    11221143        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
     
    11341155        @echo "This command is intended for maintainers to use"
    11351156        @echo "it deletes files that may require special tools to rebuild."
    1136 clean: clean-am
    1137 
    1138 clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
     1157clean: clean-recursive
     1158
     1159clean-am: clean-binPROGRAMS clean-coinlibLTLIBRARIES clean-generic \
    11391160        clean-libtool mostlyclean-am
    11401161
    1141 distclean: distclean-am
     1162distclean: distclean-recursive
    11421163        -rm -rf ./$(DEPDIR)
    11431164        -rm -f Makefile
     
    11451166        distclean-libtool distclean-tags
    11461167
    1147 dvi: dvi-am
     1168dvi: dvi-recursive
    11481169
    11491170dvi-am:
    11501171
    1151 html: html-am
    1152 
    1153 info: info-am
     1172html: html-recursive
     1173
     1174info: info-recursive
    11541175
    11551176info-am:
    11561177
    1157 install-data-am: install-includecoinHEADERS
    1158 
    1159 install-exec-am: install-binPROGRAMS install-exec-local \
    1160         install-libLTLIBRARIES
    1161 
    1162 install-info: install-info-am
     1178install-data-am: install-coinlibLTLIBRARIES install-includecoinHEADERS
     1179
     1180install-exec-am: install-binPROGRAMS install-exec-local
     1181
     1182install-info: install-info-recursive
    11631183
    11641184install-man:
     
    11661186installcheck-am:
    11671187
    1168 maintainer-clean: maintainer-clean-am
     1188maintainer-clean: maintainer-clean-recursive
    11691189        -rm -rf ./$(DEPDIR)
    11701190        -rm -f Makefile
    11711191maintainer-clean-am: distclean-am maintainer-clean-generic
    11721192
    1173 mostlyclean: mostlyclean-am
     1193mostlyclean: mostlyclean-recursive
    11741194
    11751195mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    11761196        mostlyclean-libtool
    11771197
    1178 pdf: pdf-am
     1198pdf: pdf-recursive
    11791199
    11801200pdf-am:
    11811201
    1182 ps: ps-am
     1202ps: ps-recursive
    11831203
    11841204ps-am:
    11851205
    1186 uninstall-am: uninstall-binPROGRAMS uninstall-includecoinHEADERS \
    1187         uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    1188 
    1189 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
    1190         clean-generic clean-libLTLIBRARIES clean-libtool ctags \
    1191         distclean distclean-compile distclean-generic \
    1192         distclean-libtool distclean-tags distdir dvi dvi-am html \
     1206uninstall-am: uninstall-binPROGRAMS uninstall-coinlibLTLIBRARIES \
     1207        uninstall-includecoinHEADERS uninstall-info-am uninstall-local
     1208
     1209uninstall-info: uninstall-info-recursive
     1210
     1211.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
     1212        clean clean-binPROGRAMS clean-coinlibLTLIBRARIES clean-generic \
     1213        clean-libtool clean-recursive ctags ctags-recursive distclean \
     1214        distclean-compile distclean-generic distclean-libtool \
     1215        distclean-recursive distclean-tags distdir dvi dvi-am html \
    11931216        html-am info info-am install install-am install-binPROGRAMS \
    1194         install-data install-data-am install-exec install-exec-am \
    1195         install-exec-local install-includecoinHEADERS install-info \
    1196         install-info-am install-libLTLIBRARIES install-man \
    1197         install-strip installcheck installcheck-am installdirs \
    1198         maintainer-clean maintainer-clean-generic mostlyclean \
    1199         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    1200         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    1201         uninstall-binPROGRAMS uninstall-includecoinHEADERS \
    1202         uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
     1217        install-coinlibLTLIBRARIES install-data install-data-am \
     1218        install-exec install-exec-am install-exec-local \
     1219        install-includecoinHEADERS install-info install-info-am \
     1220        install-man install-strip installcheck installcheck-am \
     1221        installdirs installdirs-am maintainer-clean \
     1222        maintainer-clean-generic maintainer-clean-recursive \
     1223        mostlyclean mostlyclean-compile mostlyclean-generic \
     1224        mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
     1225        tags tags-recursive uninstall uninstall-am \
     1226        uninstall-binPROGRAMS uninstall-coinlibLTLIBRARIES \
     1227        uninstall-includecoinHEADERS uninstall-info-am uninstall-local
    12031228
    12041229
Note: See TracChangeset for help on using the changeset viewer.