Ignore:
Timestamp:
Mar 16, 2009 6:30:25 AM (10 years ago)
Author:
forrest
Message:

chnages to try and make faster

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/Makefile.in

    r1121 r1132  
    6161
    6262@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
    6367
    6468# If we have the Ampl solver library, we need to add additional things
    6569#cbc_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    66 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_4 = $(ASLLIB)
    67 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_5 = $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
     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
    6872
    6973########################################################################
     
    7377# Name of the executable compiled in this directory.  We want it to be
    7478# installed in the 'bin' directory
    75 @CBC_BUILD_CBC_GENERIC_TRUE@am__append_6 = cbc-generic
     79@CBC_BUILD_CBC_GENERIC_TRUE@am__append_8 = cbc-generic
    7680
    7781# List all additionally required solver and Osi libraries
    78 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_7 = -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
     82@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_9 = -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    7983@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    8084@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
    8185
    82 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_8 = $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     86@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_10 = $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    8387@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ $(CLPOBJDIR)/src/libClp.la
    8488
    85 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_9 = `cat $(CLPOBJDIR)/clp_addlibs.txt`
    86 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@am__append_10 = -I`$(CYGPATH_W) $(CPXINCDIR)` \
     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)` \
    8791@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    8892
    89 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@am__append_11 = $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    90 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__append_12 = -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/DylpStdLib` \
     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` \
    9195@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@        -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/Dylp` \
    9296@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@        -I`$(CYGPATH_W) $(DYLPOBJDIR)/inc` \
    9397@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiDylp`
    9498
    95 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__append_13 = $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
     99@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__append_15 = $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    96100@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@        $(DYLPOBJDIR)/src/Dylp/libDylp.la
    97101
    98 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__append_14 = `cat $(DYLPOBJDIR)/dylp_addlibs.txt`
    99 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_FMP_TRUE@am__append_15 = -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiFmp`
    100 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_FMP_TRUE@am__append_16 = $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
    101 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@am__append_17 = -I`$(CYGPATH_W) $(GLPKINCDIR)` \
     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)` \
    102106@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiGlpk`
    103107
    104 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@am__append_18 = $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
    105 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__append_19 = -I`$(CYGPATH_W) $(MSKINCDIR)` \
     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)` \
    106110@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiMsk`
    107111
    108 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__append_20 = $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    109 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_OSL_TRUE@am__append_21 = -I`$(CYGPATH_W) $(OSLINCDIR)` \
     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)` \
    110114@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_OSL_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
    111115
    112 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_OSL_TRUE@am__append_22 = $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    113 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SPX_TRUE@am__append_23 = -I`$(CYGPATH_W) $(SPXINCDIR)` \
     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)` \
    114118@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SPX_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSpx`
    115119
    116 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SPX_TRUE@am__append_24 = $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    117 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@am__append_25 = -I`$(CYGPATH_W) $(SYMPHONYSRCDIR)/src` \
     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` \
    118122@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@    -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSym`
    119123
    120 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@am__append_26 = $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
     124@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@am__append_28 = $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    121125@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@    $(SYMPHONYOBJDIR)/src/libSym.la
    122126
    123 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@am__append_27 = `cat $(SYMPHONYOBJDIR)/sym_addlibs.txt`
    124 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_28 = -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
     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` \
    125129@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiVol`
    126130
    127 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_29 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
     131@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_31 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    128132@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@ $(VOLOBJDIR)/src/libVol.la
    129133
    130 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_30 = `cat $(VOLOBJDIR)/vol_addlibs.txt`
    131 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__append_31 = -I`$(CYGPATH_W) $(XPRINCDIR)` \
     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)` \
    132136@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr`
    133137
    134 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__append_32 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    135 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_33 = $(ASLLIB)
    136 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_34 = $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
     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
    137141subdir = src
    138142DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
     
    182186@COIN_HAS_CLP_TRUE@am_cbc_OBJECTS = CoinSolve.$(OBJEXT)
    183187cbc_OBJECTS = $(am_cbc_OBJECTS)
    184 am__DEPENDENCIES_1 =
    185 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_2 =  \
    186 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@  $(am__DEPENDENCIES_1)
     188@COIN_HAS_CLP_TRUE@@COIN_HAS_CPX_TRUE@am__DEPENDENCIES_1 = $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
     189am__DEPENDENCIES_2 =
     190@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_3 =  \
     191@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@  $(am__DEPENDENCIES_2)
    187192@COIN_HAS_CLP_TRUE@cbc_DEPENDENCIES = libCbcSolver.la libCbc.la \
    188193@COIN_HAS_CLP_TRUE@     $(CGLOBJDIR)/src/libCgl.la \
     
    191196@COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la \
    192197@COIN_HAS_CLP_TRUE@     $(COINUTILSOBJDIR)/src/libCoinUtils.la \
    193 @COIN_HAS_CLP_TRUE@     $(am__DEPENDENCIES_2)
     198@COIN_HAS_CLP_TRUE@     $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3)
    194199am__cbc_generic_SOURCES_DIST = CbcGenBaB.cpp CbcGenCbcParam.cpp \
    195200        CbcGenCbcParam.hpp CbcGenCbcParamUtils.cpp CbcGenCtlBlk.cpp \
     
    212217@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenSolvers.$(OBJEXT)
    213218cbc_generic_OBJECTS = $(am_cbc_generic_OBJECTS)
    214 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_3 = $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     219@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_4 = $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    215220@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ $(CLPOBJDIR)/src/libClp.la
    216 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@am__DEPENDENCIES_4 = $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    217 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_5 = $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
     221@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@am__DEPENDENCIES_5 = $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
     222@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_6 = $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    218223@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@        $(DYLPOBJDIR)/src/Dylp/libDylp.la
    219 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_FMP_TRUE@am__DEPENDENCIES_6 = $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
    220 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@am__DEPENDENCIES_7 = $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
    221 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__DEPENDENCIES_8 = $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    222 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_OSL_TRUE@am__DEPENDENCIES_9 = $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    223 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SPX_TRUE@am__DEPENDENCIES_10 = $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    224 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@am__DEPENDENCIES_11 = $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
     224@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_FMP_TRUE@am__DEPENDENCIES_7 = $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
     225@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@am__DEPENDENCIES_8 = $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
     226@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__DEPENDENCIES_9 = $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
     227@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_OSL_TRUE@am__DEPENDENCIES_10 = $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
     228@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SPX_TRUE@am__DEPENDENCIES_11 = $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
     229@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@am__DEPENDENCIES_12 = $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    225230@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYMPHONY_TRUE@    $(SYMPHONYOBJDIR)/src/libSym.la
    226 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__DEPENDENCIES_12 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
     231@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__DEPENDENCIES_13 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    227232@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@ $(VOLOBJDIR)/src/libVol.la
    228 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_13 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    229 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1)
     233@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_14 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
     234@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_2)
    230235@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_DEPENDENCIES =  \
    231236@CBC_BUILD_CBC_GENERIC_TRUE@    libCbcSolver.la libCbc.la \
    232237@CBC_BUILD_CBC_GENERIC_TRUE@    $(CGLOBJDIR)/src/libCgl.la \
    233 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_3) \
    234238@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_4) \
    235239@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_5) \
     
    243247@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_13) \
    244248@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_14) \
     249@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_15) \
    245250@CBC_BUILD_CBC_GENERIC_TRUE@    $(OSIOBJDIR)/src/libOsi.la \
    246251@CBC_BUILD_CBC_GENERIC_TRUE@    $(COINUTILSOBJDIR)/src/libCoinUtils.la
     
    344349CPP = @CPP@
    345350CPPFLAGS = @CPPFLAGS@
     351CPXDOCDIR = @CPXDOCDIR@
    346352CPXINCDIR = @CPXINCDIR@
    347353CPXLIB = @CPXLIB@
     354CPXOBJDIR = @CPXOBJDIR@
     355CPXSRCDIR = @CPXSRCDIR@
    348356CXX = @CXX@
    349357CXXCPP = @CXXCPP@
     
    384392        $(OSIOBJDIR)/osi_addlibs.txt` `cat \
    385393        $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS) \
    386         $(am__append_3) $(am__append_9) $(am__append_14) \
    387         $(am__append_27) $(am__append_30)
     394        $(am__append_3) $(am__append_11) $(am__append_16) \
     395        $(am__append_29) $(am__append_32)
    388396LIBTOOL = @LIBTOOL@
    389397LIBTOOLM4 = @LIBTOOLM4@
     
    557565
    558566# List additional defines
    559 AM_CPPFLAGS = $(am__append_2) $(am__append_5) $(am__append_7) \
    560         $(am__append_10) $(am__append_12) $(am__append_15) \
     567AM_CPPFLAGS = $(am__append_2) $(am__append_4) $(am__append_7) \
     568        $(am__append_9) $(am__append_12) $(am__append_14) \
    561569        $(am__append_17) $(am__append_19) $(am__append_21) \
    562         $(am__append_23) $(am__append_25) $(am__append_28) \
    563         $(am__append_31) $(am__append_34) -I`$(CYGPATH_W) \
    564         $(CGLSRCDIR)/src` -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` \
    565         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglDuplicateRow` \
    566         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglFlowCover` -I`$(CYGPATH_W) \
     570        $(am__append_23) $(am__append_25) $(am__append_27) \
     571        $(am__append_30) $(am__append_33) $(am__append_36) \
     572        -I`$(CYGPATH_W) $(CGLSRCDIR)/src` -I`$(CYGPATH_W) \
     573        $(CGLSRCDIR)/src/CglClique` -I`$(CYGPATH_W) \
     574        $(CGLSRCDIR)/src/CglDuplicateRow` -I`$(CYGPATH_W) \
     575        $(CGLSRCDIR)/src/CglFlowCover` -I`$(CYGPATH_W) \
    567576        $(CGLSRCDIR)/src/CglGomory` -I`$(CYGPATH_W) \
    568577        $(CGLSRCDIR)/src/CglKnapsackCover` -I`$(CYGPATH_W) \
     
    594603@COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la \
    595604@COIN_HAS_CLP_TRUE@     $(COINUTILSOBJDIR)/src/libCoinUtils.la \
    596 @COIN_HAS_CLP_TRUE@     $(am__append_4)
     605@COIN_HAS_CLP_TRUE@     $(am__append_5) $(am__append_6)
    597606
    598607# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    618627@CBC_BUILD_CBC_GENERIC_TRUE@    libCbc.la \
    619628@CBC_BUILD_CBC_GENERIC_TRUE@    $(CGLOBJDIR)/src/libCgl.la \
    620 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_8) $(am__append_11) \
    621 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_13) $(am__append_16) \
    622 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_18) $(am__append_20) \
    623 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_22) $(am__append_24) \
    624 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_26) $(am__append_29) \
    625 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_32) $(am__append_33) \
     629@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_10) $(am__append_13) \
     630@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_15) $(am__append_18) \
     631@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_20) $(am__append_22) \
     632@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_24) $(am__append_26) \
     633@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_28) $(am__append_31) \
     634@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_34) $(am__append_35) \
    626635@CBC_BUILD_CBC_GENERIC_TRUE@    $(OSIOBJDIR)/src/libOsi.la \
    627636@CBC_BUILD_CBC_GENERIC_TRUE@    $(COINUTILSOBJDIR)/src/libCoinUtils.la
Note: See TracChangeset for help on using the changeset viewer.