Changeset 316


Ignore:
Timestamp:
May 13, 2006 11:49:06 AM (13 years ago)
Author:
andreasw
Message:

minor corrections

Location:
trunk/Cbc
Files:
4 edited

Legend:

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

    r315 r316  
    6565
    6666cbc_LDADD = libCbc.la \
    67         $(CGLOBJDIR)/src/libCgl.la
     67        $(CGLOBJDIR)/src/libCgl.la \
     68        $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la
     69CXXFLAGS += -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`
    6870
    6971# List all additionally required solver and Osi libraries
     
    7577        $(CLPOBJDIR)/src/libClp.la
    7678  LIBS  += `cat $(CLPOBJDIR)/clp_addlibs.txt`
    77 endif
    78 
    79 if COIN_HAS_CBC
    80   CXXFLAGS += -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    81         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`
    82   cbc_LDADD += $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la \
    83         $(CBCOBJDIR)/src/libCbc.la
    84   LIBS += `cat $(CBCOBJDIR)/cbc_addlibs.txt`
    8579endif
    8680
  • trunk/Cbc/src/Makefile.in

    r315 r316  
    5656
    5757@COIN_HAS_CLP_TRUE@am__append_3 = `cat $(CLPOBJDIR)/clp_addlibs.txt`
    58 @COIN_HAS_CBC_TRUE@am__append_4 = -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    59 @COIN_HAS_CBC_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`
    60 
    61 @COIN_HAS_CBC_TRUE@am__append_5 = $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la \
    62 @COIN_HAS_CBC_TRUE@     $(CBCOBJDIR)/src/libCbc.la
    63 
    64 @COIN_HAS_CBC_TRUE@am__append_6 = `cat $(CBCOBJDIR)/cbc_addlibs.txt`
    65 @COIN_HAS_CPX_TRUE@am__append_7 = -I`$(CYGPATH_W) $(CPXINCDIR)` \
     58@COIN_HAS_CPX_TRUE@am__append_4 = -I`$(CYGPATH_W) $(CPXINCDIR)` \
    6659@COIN_HAS_CPX_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    6760
    68 @COIN_HAS_CPX_TRUE@am__append_8 = $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    69 @COIN_HAS_DYLP_TRUE@am__append_9 = -I`$(CYGPATH_W) $(DYLPSRCDIR)/src` \
     61@COIN_HAS_CPX_TRUE@am__append_5 = $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
     62@COIN_HAS_DYLP_TRUE@am__append_6 = -I`$(CYGPATH_W) $(DYLPSRCDIR)/src` \
    7063@COIN_HAS_DYLP_TRUE@    -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiDylp`
    7164
    72 @COIN_HAS_DYLP_TRUE@am__append_10 = $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
     65@COIN_HAS_DYLP_TRUE@am__append_7 = $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    7366@COIN_HAS_DYLP_TRUE@    $(DYLPOBJDIR)/src/libDylp.la
    7467
    75 @COIN_HAS_DYLP_TRUE@am__append_11 = `cat $(DYLPOBJDIR)/dylp_addlibs.txt`
    76 @COIN_HAS_FMP_TRUE@am__append_12 = -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiFmp`
    77 @COIN_HAS_FMP_TRUE@am__append_13 = $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
    78 @COIN_HAS_GLPK_TRUE@am__append_14 = -I`$(CYGPATH_W) $(GLPKINCDIR)` \
     68@COIN_HAS_DYLP_TRUE@am__append_8 = `cat $(DYLPOBJDIR)/dylp_addlibs.txt`
     69@COIN_HAS_FMP_TRUE@am__append_9 = -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiFmp`
     70@COIN_HAS_FMP_TRUE@am__append_10 = $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
     71@COIN_HAS_GLPK_TRUE@am__append_11 = -I`$(CYGPATH_W) $(GLPKINCDIR)` \
    7972@COIN_HAS_GLPK_TRUE@    -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiGlpk`
    8073
    81 @COIN_HAS_GLPK_TRUE@am__append_15 = $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
    82 @COIN_HAS_MSK_TRUE@am__append_16 = -I`$(CYGPATH_W) $(MSKINCDIR)` \
     74@COIN_HAS_GLPK_TRUE@am__append_12 = $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
     75@COIN_HAS_MSK_TRUE@am__append_13 = -I`$(CYGPATH_W) $(MSKINCDIR)` \
    8376@COIN_HAS_MSK_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiMsk`
    8477
    85 @COIN_HAS_MSK_TRUE@am__append_17 = $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    86 @COIN_HAS_OSL_TRUE@am__append_18 = -I`$(CYGPATH_W) $(OSLINCDIR)` \
     78@COIN_HAS_MSK_TRUE@am__append_14 = $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
     79@COIN_HAS_OSL_TRUE@am__append_15 = -I`$(CYGPATH_W) $(OSLINCDIR)` \
    8780@COIN_HAS_OSL_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
    8881
    89 @COIN_HAS_OSL_TRUE@am__append_19 = $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    90 @COIN_HAS_SPX_TRUE@am__append_20 = -I`$(CYGPATH_W) $(SPXINCDIR)` \
     82@COIN_HAS_OSL_TRUE@am__append_16 = $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
     83@COIN_HAS_SPX_TRUE@am__append_17 = -I`$(CYGPATH_W) $(SPXINCDIR)` \
    9184@COIN_HAS_SPX_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSpx`
    9285
    93 @COIN_HAS_SPX_TRUE@am__append_21 = $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    94 @COIN_HAS_SYM_TRUE@am__append_22 = -I`$(CYGPATH_W) $(SYMSRCDIR)/src` \
     86@COIN_HAS_SPX_TRUE@am__append_18 = $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
     87@COIN_HAS_SYM_TRUE@am__append_19 = -I`$(CYGPATH_W) $(SYMSRCDIR)/src` \
    9588@COIN_HAS_SYM_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSym`
    9689
    97 @COIN_HAS_SYM_TRUE@am__append_23 = $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
     90@COIN_HAS_SYM_TRUE@am__append_20 = $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    9891@COIN_HAS_SYM_TRUE@     $(SYMOBJDIR)/src/libSym.la
    9992
    100 @COIN_HAS_SYM_TRUE@am__append_24 = `cat $(SYMOBJDIR)/sym_addlibs.txt`
    101 @COIN_HAS_VOL_TRUE@am__append_25 = -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
     93@COIN_HAS_SYM_TRUE@am__append_21 = `cat $(SYMOBJDIR)/sym_addlibs.txt`
     94@COIN_HAS_VOL_TRUE@am__append_22 = -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
    10295@COIN_HAS_VOL_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiVol`
    10396
    104 @COIN_HAS_VOL_TRUE@am__append_26 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
     97@COIN_HAS_VOL_TRUE@am__append_23 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    10598@COIN_HAS_VOL_TRUE@     $(VOLOBJDIR)/src/libVol.la
    10699
    107 @COIN_HAS_VOL_TRUE@am__append_27 = `cat $(VOLOBJDIR)/vol_addlibs.txt`
    108 @COIN_HAS_XPR_TRUE@am__append_28 = -I`$(CYGPATH_W) $(XPRINCDIR)` \
     100@COIN_HAS_VOL_TRUE@am__append_24 = `cat $(VOLOBJDIR)/vol_addlibs.txt`
     101@COIN_HAS_XPR_TRUE@am__append_25 = -I`$(CYGPATH_W) $(XPRINCDIR)` \
    109102@COIN_HAS_XPR_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr`
    110103
    111 @COIN_HAS_XPR_TRUE@am__append_29 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
     104@COIN_HAS_XPR_TRUE@am__append_26 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    112105subdir = src
    113106DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     
    149142@COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    150143@COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la
    151 @COIN_HAS_CBC_TRUE@am__DEPENDENCIES_2 =  \
    152 @COIN_HAS_CBC_TRUE@     $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la \
    153 @COIN_HAS_CBC_TRUE@     $(CBCOBJDIR)/src/libCbc.la
    154 @COIN_HAS_CPX_TRUE@am__DEPENDENCIES_3 =  \
     144@COIN_HAS_CPX_TRUE@am__DEPENDENCIES_2 =  \
    155145@COIN_HAS_CPX_TRUE@     $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    156 @COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_4 =  \
     146@COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_3 =  \
    157147@COIN_HAS_DYLP_TRUE@    $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    158148@COIN_HAS_DYLP_TRUE@    $(DYLPOBJDIR)/src/libDylp.la
    159 @COIN_HAS_FMP_TRUE@am__DEPENDENCIES_5 =  \
     149@COIN_HAS_FMP_TRUE@am__DEPENDENCIES_4 =  \
    160150@COIN_HAS_FMP_TRUE@     $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
    161 @COIN_HAS_GLPK_TRUE@am__DEPENDENCIES_6 =  \
     151@COIN_HAS_GLPK_TRUE@am__DEPENDENCIES_5 =  \
    162152@COIN_HAS_GLPK_TRUE@    $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
    163 @COIN_HAS_MSK_TRUE@am__DEPENDENCIES_7 =  \
     153@COIN_HAS_MSK_TRUE@am__DEPENDENCIES_6 =  \
    164154@COIN_HAS_MSK_TRUE@     $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    165 @COIN_HAS_OSL_TRUE@am__DEPENDENCIES_8 =  \
     155@COIN_HAS_OSL_TRUE@am__DEPENDENCIES_7 =  \
    166156@COIN_HAS_OSL_TRUE@     $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    167 @COIN_HAS_SPX_TRUE@am__DEPENDENCIES_9 =  \
     157@COIN_HAS_SPX_TRUE@am__DEPENDENCIES_8 =  \
    168158@COIN_HAS_SPX_TRUE@     $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    169 @COIN_HAS_SYM_TRUE@am__DEPENDENCIES_10 =  \
     159@COIN_HAS_SYM_TRUE@am__DEPENDENCIES_9 =  \
    170160@COIN_HAS_SYM_TRUE@     $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    171161@COIN_HAS_SYM_TRUE@     $(SYMOBJDIR)/src/libSym.la
    172 @COIN_HAS_VOL_TRUE@am__DEPENDENCIES_11 =  \
     162@COIN_HAS_VOL_TRUE@am__DEPENDENCIES_10 =  \
    173163@COIN_HAS_VOL_TRUE@     $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    174164@COIN_HAS_VOL_TRUE@     $(VOLOBJDIR)/src/libVol.la
    175 @COIN_HAS_XPR_TRUE@am__DEPENDENCIES_12 =  \
     165@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_11 =  \
    176166@COIN_HAS_XPR_TRUE@     $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    177167cbc_DEPENDENCIES = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    178         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
    179         $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4) \
    180         $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
    181         $(am__DEPENDENCIES_7) $(am__DEPENDENCIES_8) \
    182         $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_10) \
    183         $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_12) \
     168        $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la $(am__DEPENDENCIES_1) \
     169        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
     170        $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
     171        $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7) \
     172        $(am__DEPENDENCIES_8) $(am__DEPENDENCIES_9) \
     173        $(am__DEPENDENCIES_10) $(am__DEPENDENCIES_11) \
    184174        $(OSIOBJDIR)/src/libOsi.la \
    185175        $(COINUTILSOBJDIR)/src/libCoinUtils.la
     
    294284# "top_srcdir" refers to the basic directory for the main package that is
    295285# being compiled.
    296 CXXFLAGS = @CXXFLAGS@ $(am__append_1) $(am__append_4) $(am__append_7) \
    297         $(am__append_9) $(am__append_12) $(am__append_14) \
    298         $(am__append_16) $(am__append_18) $(am__append_20) \
    299         $(am__append_22) $(am__append_25) $(am__append_28) \
    300         -I`$(CYGPATH_W) $(CGLSRCDIR)/src` -I`$(CYGPATH_W) \
    301         $(CGLSRCDIR)/src/CglClique` -I`$(CYGPATH_W) \
    302         $(CGLSRCDIR)/src/CglFlowCover` -I`$(CYGPATH_W) \
     286CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc` \
     287        $(am__append_1) $(am__append_4) $(am__append_6) \
     288        $(am__append_9) $(am__append_11) $(am__append_13) \
     289        $(am__append_15) $(am__append_17) $(am__append_19) \
     290        $(am__append_22) $(am__append_25) -I`$(CYGPATH_W) \
     291        $(CGLSRCDIR)/src` -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` \
     292        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglFlowCover` -I`$(CYGPATH_W) \
    303293        $(CGLSRCDIR)/src/CglGomory` -I`$(CYGPATH_W) \
    304294        $(CGLSRCDIR)/src/CglKnapsackCover` -I`$(CYGPATH_W) \
     
    338328LDFLAGS = @LDFLAGS@
    339329LIBOBJS = @LIBOBJS@
    340 LIBS = @LIBS@ $(am__append_3) $(am__append_6) $(am__append_11) \
    341         $(am__append_24) $(am__append_27) `cat \
     330LIBS = @LIBS@ $(am__append_3) $(am__append_8) $(am__append_21) \
     331        $(am__append_24) `cat \
    342332        $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
    343333LIBTOOL = @LIBTOOL@
     
    478468
    479469# Finally the Osi Coin library (many of the above need it)
    480 cbc_LDADD = libCbc.la $(CGLOBJDIR)/src/libCgl.la $(am__append_2) \
    481         $(am__append_5) $(am__append_8) $(am__append_10) \
    482         $(am__append_13) $(am__append_15) $(am__append_17) \
    483         $(am__append_19) $(am__append_21) $(am__append_23) \
    484         $(am__append_26) $(am__append_29) $(OSIOBJDIR)/src/libOsi.la \
     470cbc_LDADD = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
     471        $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la $(am__append_2) \
     472        $(am__append_5) $(am__append_7) $(am__append_10) \
     473        $(am__append_12) $(am__append_14) $(am__append_16) \
     474        $(am__append_18) $(am__append_20) $(am__append_23) \
     475        $(am__append_26) $(OSIOBJDIR)/src/libOsi.la \
    485476        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    486477
  • trunk/Cbc/test/Makefile.am

    r312 r316  
    1515# We are using the CLP solver executable to do the unit test
    1616
    17 test: ../src/cbc_solver ../src/solve
    18         ../src/cbc_solver -miplib -unitTest
     17test: ../src/cbc ../src/solve
     18        ../src/cbc -miplib -unitTest
    1919        ../src/solve -unitTest -netlib
    2020
  • trunk/Cbc/test/Makefile.in

    r313 r316  
    409409# We are using the CLP solver executable to do the unit test
    410410
    411 test: ../src/cbc_solver ../src/solve
    412         ../src/cbc_solver -miplib -unitTest
     411test: ../src/cbc ../src/solve
     412        ../src/cbc -miplib -unitTest
    413413        ../src/solve -unitTest -netlib
    414414
Note: See TracChangeset for help on using the changeset viewer.