Changeset 592 for branches/devel/Cbc/src


Ignore:
Timestamp:
Mar 30, 2007 5:16:44 PM (13 years ago)
Author:
lou
Message:

Configuration and makefile changes for cbc-generic.

Location:
branches/devel/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/Makefile.am

    r587 r592  
    4848        CbcLinked.cpp CbcLinked.hpp \
    4949        CbcTreeLocal.cpp CbcTreeLocal.hpp
     50
    5051## If we have the Ampl solver library, we need to add additional things
    5152## also see lower down
     
    5354libCbc_la_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    5455
     56
    5557# This is for libtool (on Windows)
     58
    5659libCbc_la_LDFLAGS = $(LT_LDFLAGS)
    5760
    58 ########################################################################
    59 #                        cbc-generic program                           #
    60 ########################################################################
     61# Some common setup for cbc and cbc-generic.
     62
     63bin_PROGRAMS =
     64AM_CPPFLAGS =
     65
     66LIBS += `cat $(CGLOBJDIR)/cgl_addlibs.txt` \
     67        `cat $(OSIOBJDIR)/osi_addlibs.txt` \
     68        `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
     69
     70
     71########################################################################
     72#                            cbc program                               #
     73########################################################################
     74
     75if COIN_HAS_CLP
    6176
    6277# Name of the executable compiled in this directory.  We want it to be
    6378# installed in the 'bin' directory
    64 bin_PROGRAMS = cbc-generic
     79bin_PROGRAMS += cbc
    6580
    6681# List all source files for this executable, including headers
     82cbc_SOURCES = \
     83        CoinSolve.cpp \
     84        unitTestClp.cpp
     85
     86# Additional COIN libraries
     87cbc_LDADD = libCbc.la \
     88        $(CGLOBJDIR)/src/libCgl.la \
     89        $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     90        $(OSIOBJDIR)/src/libOsi.la \
     91        $(CLPOBJDIR)/src/libClp.la \
     92        $(COINUTILSOBJDIR)/src/libCoinUtils.la
     93
     94# Finally, the -rpath flag is used by libtool to make sure that the shared
     95# library is found (in the lib install directory) when we are using dynamic
     96# libraries.
     97cbc_LDFLAGS = -rpath $(libdir)
     98
     99# Add locations of include files.
     100
     101AM_CPPFLAGS += -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
     102        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
     103        -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
     104LIBS  += `cat $(CLPOBJDIR)/clp_addlibs.txt`
     105
     106# If we have the Ampl solver library, we need to add additional things
     107if COIN_HAS_ASL
     108#cbc_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
     109cbc_LDADD += $(ASLLIB)
     110AM_CPPFLAGS += $(ASL_CPPFLAGS)
     111endif
     112
     113endif
     114
     115
     116########################################################################
     117#                        cbc-generic program                           #
     118########################################################################
     119
     120if CBC_BUILD_CBC_GENERIC
     121
     122# Name of the executable compiled in this directory.  We want it to be
     123# installed in the 'bin' directory
     124
     125bin_PROGRAMS += cbc-generic
     126
     127# List all source files for this executable, including headers
     128
    67129cbc_generic_SOURCES = \
    68         CbcMain.cpp \
    69         CbcParam.cpp CbcParam.hpp \
    70         unitTest.cpp
     130        CbcGenBaB.cpp \
     131        CbcGenCbcParam.cpp CbcGenCbcParam.hpp CbcGenCbcParamUtils.cpp \
     132        CbcGenCtlBlk.cpp CbcGenCtlBlk.hpp \
     133        CbcGeneric.cpp \
     134        CbcGenOsiParam.cpp CbcGenOsiParam.hpp CbcGenOsiParamUtils.cpp \
     135        CbcGenParam.cpp CbcGenParam.hpp CbcGenParamUtils.cpp \
     136        CbcGenSolution.cpp \
     137        CbcGenSolvers.cpp
    71138
    72139cbc_generic_LDADD = libCbc.la \
    73         $(CGLOBJDIR)/src/libCgl.la \
    74         $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la
    75 AM_CPPFLAGS = -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`
     140        $(CGLOBJDIR)/src/libCgl.la
    76141
    77142# List all additionally required solver and Osi libraries
     143
    78144if COIN_HAS_CLP
    79145  AM_CPPFLAGS += -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
     
    155221cbc_generic_LDADD += $(OSIOBJDIR)/src/libOsi.la \
    156222        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    157 LIBS += `cat $(OSIOBJDIR)/osi_addlibs.txt` \
    158         `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
    159223
    160224# Finally, the -rpath flag is used by libtool to make sure that the shared
    161225# library is found (in the lib install directory) when we are using dynamic
    162226# libraries.
     227
    163228cbc_generic_LDFLAGS = -rpath $(libdir)
    164 
    165 ## If we have the Ampl solver library, we need to add additional things
    166 #if COIN_HAS_ASL
    167 #cbc_generic_LDADD += $(ASLLIB)
    168 #endif
    169 
    170 ########################################################################
    171 #                            cbc program                               #
    172 ########################################################################
    173 
    174 if COIN_HAS_CLP
    175 
    176 # Name of the executable compiled in this directory.  We want it to be
    177 # installed in the 'bin' directory
    178 bin_PROGRAMS += cbc
    179 
    180 # List all source files for this executable, including headers
    181 cbc_SOURCES = \
    182         CoinSolve.cpp \
    183         unitTestClp.cpp
    184 
    185 # Additional COIN libraries
    186 cbc_LDADD = libCbc.la \
    187         $(CGLOBJDIR)/src/libCgl.la \
    188         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    189         $(OSIOBJDIR)/src/libOsi.la \
    190         $(CLPOBJDIR)/src/libClp.la \
    191         $(COINUTILSOBJDIR)/src/libCoinUtils.la
    192 
    193 # Finally, the -rpath flag is used by libtool to make sure that the shared
    194 # library is found (in the lib install directory) when we are using dynamic
    195 # libraries.
    196 cbc_LDFLAGS = -rpath $(libdir)
    197 
    198 # If we have the Ampl solver library, we need to add additional things
    199 if COIN_HAS_ASL
    200 #cbc_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    201 cbc_LDADD += $(ASLLIB)
    202 AM_CPPFLAGS += $(ASL_CPPFLAGS)
    203 endif
    204229
    205230endif
  • branches/devel/Cbc/src/Makefile.in

    r587 r592  
    4545build_triplet = @build@
    4646host_triplet = @host@
    47 bin_PROGRAMS = cbc-generic$(EXEEXT) $(am__EXEEXT_1)
    48 
    49 # List all additionally required solver and Osi libraries
    50 @COIN_HAS_CLP_TRUE@am__append_1 = -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    51 @COIN_HAS_CLP_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    52 @COIN_HAS_CLP_TRUE@     -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
    53 
    54 @COIN_HAS_CLP_TRUE@am__append_2 = $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    55 @COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la
    56 
    57 @COIN_HAS_CLP_TRUE@am__append_3 = `cat $(CLPOBJDIR)/clp_addlibs.txt`
    58 @COIN_HAS_CPX_TRUE@am__append_4 = -I`$(CYGPATH_W) $(CPXINCDIR)` \
    59 @COIN_HAS_CPX_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    60 
    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/DylpStdLib` \
    63 @COIN_HAS_DYLP_TRUE@        -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/Dylp` \
    64 @COIN_HAS_DYLP_TRUE@        -I`$(CYGPATH_W) $(DYLPOBJDIR)/inc` \
    65 @COIN_HAS_DYLP_TRUE@    -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiDylp`
    66 
    67 @COIN_HAS_DYLP_TRUE@am__append_7 = $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    68 @COIN_HAS_DYLP_TRUE@    $(DYLPOBJDIR)/src/Dylp/libDylp.la
    69 
    70 @COIN_HAS_DYLP_TRUE@am__append_8 = `cat $(DYLPOBJDIR)/dylp_addlibs.txt`
    71 @COIN_HAS_FMP_TRUE@am__append_9 = -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiFmp`
    72 @COIN_HAS_FMP_TRUE@am__append_10 = $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
    73 @COIN_HAS_GLPK_TRUE@am__append_11 = -I`$(CYGPATH_W) $(GLPKINCDIR)` \
    74 @COIN_HAS_GLPK_TRUE@    -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiGlpk`
    75 
    76 @COIN_HAS_GLPK_TRUE@am__append_12 = $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
    77 @COIN_HAS_MSK_TRUE@am__append_13 = -I`$(CYGPATH_W) $(MSKINCDIR)` \
    78 @COIN_HAS_MSK_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiMsk`
    79 
    80 @COIN_HAS_MSK_TRUE@am__append_14 = $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    81 @COIN_HAS_OSL_TRUE@am__append_15 = -I`$(CYGPATH_W) $(OSLINCDIR)` \
    82 @COIN_HAS_OSL_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
    83 
    84 @COIN_HAS_OSL_TRUE@am__append_16 = $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    85 @COIN_HAS_SPX_TRUE@am__append_17 = -I`$(CYGPATH_W) $(SPXINCDIR)` \
    86 @COIN_HAS_SPX_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSpx`
    87 
    88 @COIN_HAS_SPX_TRUE@am__append_18 = $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    89 @COIN_HAS_SYM_TRUE@am__append_19 = -I`$(CYGPATH_W) $(SYMSRCDIR)/src` \
    90 @COIN_HAS_SYM_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSym`
    91 
    92 @COIN_HAS_SYM_TRUE@am__append_20 = $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    93 @COIN_HAS_SYM_TRUE@     $(SYMOBJDIR)/src/libSym.la
    94 
    95 @COIN_HAS_SYM_TRUE@am__append_21 = `cat $(SYMOBJDIR)/sym_addlibs.txt`
    96 @COIN_HAS_VOL_TRUE@am__append_22 = -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
    97 @COIN_HAS_VOL_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiVol`
    98 
    99 @COIN_HAS_VOL_TRUE@am__append_23 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    100 @COIN_HAS_VOL_TRUE@     $(VOLOBJDIR)/src/libVol.la
    101 
    102 @COIN_HAS_VOL_TRUE@am__append_24 = `cat $(VOLOBJDIR)/vol_addlibs.txt`
    103 @COIN_HAS_XPR_TRUE@am__append_25 = -I`$(CYGPATH_W) $(XPRINCDIR)` \
    104 @COIN_HAS_XPR_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr`
    105 
    106 @COIN_HAS_XPR_TRUE@am__append_26 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    107 
    108 #if COIN_HAS_ASL
    109 #cbc_generic_LDADD += $(ASLLIB)
    110 #endif
     47bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
    11148
    11249########################################################################
     
    11653# Name of the executable compiled in this directory.  We want it to be
    11754# installed in the 'bin' directory
    118 @COIN_HAS_CLP_TRUE@am__append_27 = cbc
     55@COIN_HAS_CLP_TRUE@am__append_1 = cbc
     56
     57# 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`
    11963
    12064# If we have the Ampl solver library, we need to add additional things
    12165#cbc_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    122 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_28 = $(ASLLIB)
    123 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_29 = $(ASL_CPPFLAGS)
     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)
     68
     69########################################################################
     70#                        cbc-generic program                           #
     71########################################################################
     72
     73# Name of the executable compiled in this directory.  We want it to be
     74# installed in the 'bin' directory
     75@CBC_BUILD_CBC_GENERIC_TRUE@am__append_6 = cbc-generic
     76
     77# 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` \
     79@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
     80@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
     81
     82@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_8 = $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     83@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ $(CLPOBJDIR)/src/libClp.la
     84
     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)` \
     87@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
     88
     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` \
     91@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@        -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/Dylp` \
     92@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@        -I`$(CYGPATH_W) $(DYLPOBJDIR)/inc` \
     93@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiDylp`
     94
     95@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__append_13 = $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
     96@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@        $(DYLPOBJDIR)/src/Dylp/libDylp.la
     97
     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_GLPK_TRUE@        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiGlpk`
     103
     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)` \
     106@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiMsk`
     107
     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)` \
     110@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_OSL_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
     111
     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)` \
     114@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SPX_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSpx`
     115
     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_SYM_TRUE@am__append_25 = -I`$(CYGPATH_W) $(SYMSRCDIR)/src` \
     118@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYM_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSym`
     119
     120@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYM_TRUE@am__append_26 = $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
     121@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYM_TRUE@ $(SYMOBJDIR)/src/libSym.la
     122
     123@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYM_TRUE@am__append_27 = `cat $(SYMOBJDIR)/sym_addlibs.txt`
     124@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_28 = -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
     125@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiVol`
     126
     127@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_29 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
     128@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@ $(VOLOBJDIR)/src/libVol.la
     129
     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)` \
     132@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr`
     133
     134@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__append_32 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    124135subdir = src
    125 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     136DIST_COMMON = README $(include_HEADERS) $(srcdir)/Makefile.am \
    126137        $(srcdir)/Makefile.in
    127138ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    156167libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS)
    157168@COIN_HAS_CLP_TRUE@am__EXEEXT_1 = cbc$(EXEEXT)
     169@CBC_BUILD_CBC_GENERIC_TRUE@am__EXEEXT_2 = cbc-generic$(EXEEXT)
    158170binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    159171PROGRAMS = $(bin_PROGRAMS)
     
    172184@COIN_HAS_CLP_TRUE@     $(COINUTILSOBJDIR)/src/libCoinUtils.la \
    173185@COIN_HAS_CLP_TRUE@     $(am__DEPENDENCIES_2)
    174 am_cbc_generic_OBJECTS = CbcMain.$(OBJEXT) CbcParam.$(OBJEXT) \
    175         unitTest.$(OBJEXT)
     186am__cbc_generic_SOURCES_DIST = CbcGenBaB.cpp CbcGenCbcParam.cpp \
     187        CbcGenCbcParam.hpp CbcGenCbcParamUtils.cpp CbcGenCtlBlk.cpp \
     188        CbcGenCtlBlk.hpp CbcGeneric.cpp CbcGenOsiParam.cpp \
     189        CbcGenOsiParam.hpp CbcGenOsiParamUtils.cpp CbcGenParam.cpp \
     190        CbcGenParam.hpp CbcGenParamUtils.cpp CbcGenSolution.cpp \
     191        CbcGenSolvers.cpp
     192@CBC_BUILD_CBC_GENERIC_TRUE@am_cbc_generic_OBJECTS =  \
     193@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenBaB.$(OBJEXT) \
     194@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenCbcParam.$(OBJEXT) \
     195@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenCbcParamUtils.$(OBJEXT) \
     196@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenCtlBlk.$(OBJEXT) \
     197@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGeneric.$(OBJEXT) \
     198@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenOsiParam.$(OBJEXT) \
     199@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenOsiParamUtils.$(OBJEXT) \
     200@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenParam.$(OBJEXT) \
     201@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenParamUtils.$(OBJEXT) \
     202@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenSolution.$(OBJEXT) \
     203@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenSolvers.$(OBJEXT)
    176204cbc_generic_OBJECTS = $(am_cbc_generic_OBJECTS)
    177 @COIN_HAS_CLP_TRUE@am__DEPENDENCIES_3 =  \
    178 @COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    179 @COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la
    180 @COIN_HAS_CPX_TRUE@am__DEPENDENCIES_4 =  \
    181 @COIN_HAS_CPX_TRUE@     $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    182 @COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_5 =  \
    183 @COIN_HAS_DYLP_TRUE@    $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    184 @COIN_HAS_DYLP_TRUE@    $(DYLPOBJDIR)/src/Dylp/libDylp.la
    185 @COIN_HAS_FMP_TRUE@am__DEPENDENCIES_6 =  \
    186 @COIN_HAS_FMP_TRUE@     $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
    187 @COIN_HAS_GLPK_TRUE@am__DEPENDENCIES_7 =  \
    188 @COIN_HAS_GLPK_TRUE@    $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
    189 @COIN_HAS_MSK_TRUE@am__DEPENDENCIES_8 =  \
    190 @COIN_HAS_MSK_TRUE@     $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    191 @COIN_HAS_OSL_TRUE@am__DEPENDENCIES_9 =  \
    192 @COIN_HAS_OSL_TRUE@     $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    193 @COIN_HAS_SPX_TRUE@am__DEPENDENCIES_10 =  \
    194 @COIN_HAS_SPX_TRUE@     $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    195 @COIN_HAS_SYM_TRUE@am__DEPENDENCIES_11 =  \
    196 @COIN_HAS_SYM_TRUE@     $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    197 @COIN_HAS_SYM_TRUE@     $(SYMOBJDIR)/src/libSym.la
    198 @COIN_HAS_VOL_TRUE@am__DEPENDENCIES_12 =  \
    199 @COIN_HAS_VOL_TRUE@     $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    200 @COIN_HAS_VOL_TRUE@     $(VOLOBJDIR)/src/libVol.la
    201 @COIN_HAS_XPR_TRUE@am__DEPENDENCIES_13 =  \
    202 @COIN_HAS_XPR_TRUE@     $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    203 cbc_generic_DEPENDENCIES = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    204         $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la $(am__DEPENDENCIES_3) \
    205         $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
    206         $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7) \
    207         $(am__DEPENDENCIES_8) $(am__DEPENDENCIES_9) \
    208         $(am__DEPENDENCIES_10) $(am__DEPENDENCIES_11) \
    209         $(am__DEPENDENCIES_12) $(am__DEPENDENCIES_13) \
    210         $(OSIOBJDIR)/src/libOsi.la \
    211         $(COINUTILSOBJDIR)/src/libCoinUtils.la
     205@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_3 = $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     206@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@ $(CLPOBJDIR)/src/libClp.la
     207@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@am__DEPENDENCIES_4 = $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
     208@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_5 = $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
     209@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@        $(DYLPOBJDIR)/src/Dylp/libDylp.la
     210@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_FMP_TRUE@am__DEPENDENCIES_6 = $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
     211@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@am__DEPENDENCIES_7 = $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
     212@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__DEPENDENCIES_8 = $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
     213@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_OSL_TRUE@am__DEPENDENCIES_9 = $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
     214@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SPX_TRUE@am__DEPENDENCIES_10 = $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
     215@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYM_TRUE@am__DEPENDENCIES_11 = $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
     216@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SYM_TRUE@ $(SYMOBJDIR)/src/libSym.la
     217@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__DEPENDENCIES_12 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
     218@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@ $(VOLOBJDIR)/src/libVol.la
     219@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_13 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
     220@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_DEPENDENCIES = libCbc.la \
     221@CBC_BUILD_CBC_GENERIC_TRUE@    $(CGLOBJDIR)/src/libCgl.la \
     222@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_3) \
     223@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_4) \
     224@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_5) \
     225@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_6) \
     226@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_7) \
     227@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_8) \
     228@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_9) \
     229@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_10) \
     230@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_11) \
     231@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_12) \
     232@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_13) \
     233@CBC_BUILD_CBC_GENERIC_TRUE@    $(OSIOBJDIR)/src/libOsi.la \
     234@CBC_BUILD_CBC_GENERIC_TRUE@    $(COINUTILSOBJDIR)/src/libCoinUtils.la
    212235depcomp = $(SHELL) $(top_srcdir)/../depcomp
    213236am__depfiles_maybe = depfiles
     
    230253SOURCES = $(libCbc_la_SOURCES) $(cbc_SOURCES) $(cbc_generic_SOURCES)
    231254DIST_SOURCES = $(libCbc_la_SOURCES) $(am__cbc_SOURCES_DIST) \
    232         $(cbc_generic_SOURCES)
     255        $(am__cbc_generic_SOURCES_DIST)
    233256includeHEADERS_INSTALL = $(INSTALL_HEADER)
    234257HEADERS = $(include_HEADERS)
     
    256279CBCOBJDIR = @CBCOBJDIR@
    257280CBCSRCDIR = @CBCSRCDIR@
     281CBC_BUILD_CBC_GENERIC_FALSE = @CBC_BUILD_CBC_GENERIC_FALSE@
     282CBC_BUILD_CBC_GENERIC_TRUE = @CBC_BUILD_CBC_GENERIC_TRUE@
    258283CC = @CC@
    259284CCDEPMODE = @CCDEPMODE@
     
    336361LIBEXT = @LIBEXT@
    337362LIBOBJS = @LIBOBJS@
    338 LIBS = @LIBS@ $(am__append_3) $(am__append_8) $(am__append_21) \
    339         $(am__append_24) `cat $(OSIOBJDIR)/osi_addlibs.txt` `cat \
    340         $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
     363LIBS = @LIBS@ `cat $(CGLOBJDIR)/cgl_addlibs.txt` `cat \
     364        $(OSIOBJDIR)/osi_addlibs.txt` `cat \
     365        $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS) \
     366        $(am__append_3) $(am__append_9) $(am__append_14) \
     367        $(am__append_27) $(am__append_30)
    341368LIBTOOL = @LIBTOOL@
    342369LIBTOOLM4 = @LIBTOOLM4@
     
    468495libCbc_la_LDFLAGS = $(LT_LDFLAGS)
    469496
    470 # List all source files for this executable, including headers
    471 cbc_generic_SOURCES = \
    472         CbcMain.cpp \
    473         CbcParam.cpp CbcParam.hpp \
    474         unitTest.cpp
    475 
    476 
    477 # Finally the Osi Coin library (many of the above need it)
    478 cbc_generic_LDADD = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    479         $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la $(am__append_2) \
    480         $(am__append_5) $(am__append_7) $(am__append_10) \
    481         $(am__append_12) $(am__append_14) $(am__append_16) \
    482         $(am__append_18) $(am__append_20) $(am__append_23) \
    483         $(am__append_26) $(OSIOBJDIR)/src/libOsi.la \
    484         $(COINUTILSOBJDIR)/src/libCoinUtils.la
    485 
    486497########################################################################
    487498#                            Additional flags                          #
     
    494505
    495506# List additional defines
    496 AM_CPPFLAGS = -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc` $(am__append_1) \
    497         $(am__append_4) $(am__append_6) $(am__append_9) \
    498         $(am__append_11) $(am__append_13) $(am__append_15) \
    499         $(am__append_17) $(am__append_19) $(am__append_22) \
    500         $(am__append_25) $(am__append_29) -I`$(CYGPATH_W) \
    501         $(CGLSRCDIR)/src` -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` \
    502         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglDuplicateRow` \
    503         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglFlowCover` -I`$(CYGPATH_W) \
     507AM_CPPFLAGS = $(am__append_2) $(am__append_5) $(am__append_7) \
     508        $(am__append_10) $(am__append_12) $(am__append_15) \
     509        $(am__append_17) $(am__append_19) $(am__append_21) \
     510        $(am__append_23) $(am__append_25) $(am__append_28) \
     511        $(am__append_31) -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
     512        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` -I`$(CYGPATH_W) \
     513        $(CGLSRCDIR)/src/CglDuplicateRow` -I`$(CYGPATH_W) \
     514        $(CGLSRCDIR)/src/CglFlowCover` -I`$(CYGPATH_W) \
    504515        $(CGLSRCDIR)/src/CglGomory` -I`$(CYGPATH_W) \
    505516        $(CGLSRCDIR)/src/CglKnapsackCover` -I`$(CYGPATH_W) \
     
    517528        -DUSE_CBCCONFIG
    518529
    519 # Finally, the -rpath flag is used by libtool to make sure that the shared
    520 # library is found (in the lib install directory) when we are using dynamic
    521 # libraries.
    522 cbc_generic_LDFLAGS = -rpath $(libdir)
    523 
    524530# List all source files for this executable, including headers
    525531@COIN_HAS_CLP_TRUE@cbc_SOURCES = \
     
    534540@COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la \
    535541@COIN_HAS_CLP_TRUE@     $(COINUTILSOBJDIR)/src/libCoinUtils.la \
    536 @COIN_HAS_CLP_TRUE@     $(am__append_28)
     542@COIN_HAS_CLP_TRUE@     $(am__append_4)
    537543
    538544# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    540546# libraries.
    541547@COIN_HAS_CLP_TRUE@cbc_LDFLAGS = -rpath $(libdir)
     548
     549# List all source files for this executable, including headers
     550@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_SOURCES = \
     551@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenBaB.cpp \
     552@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenCbcParam.cpp CbcGenCbcParam.hpp CbcGenCbcParamUtils.cpp \
     553@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenCtlBlk.cpp CbcGenCtlBlk.hpp \
     554@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGeneric.cpp \
     555@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenOsiParam.cpp CbcGenOsiParam.hpp CbcGenOsiParamUtils.cpp \
     556@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenParam.cpp CbcGenParam.hpp CbcGenParamUtils.cpp \
     557@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenSolution.cpp \
     558@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenSolvers.cpp
     559
     560
     561# Finally the Osi Coin library (many of the above need it)
     562@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_LDADD = libCbc.la \
     563@CBC_BUILD_CBC_GENERIC_TRUE@    $(CGLOBJDIR)/src/libCgl.la \
     564@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_8) $(am__append_11) \
     565@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_13) $(am__append_16) \
     566@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_18) $(am__append_20) \
     567@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_22) $(am__append_24) \
     568@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_26) $(am__append_29) \
     569@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_32) \
     570@CBC_BUILD_CBC_GENERIC_TRUE@    $(OSIOBJDIR)/src/libOsi.la \
     571@CBC_BUILD_CBC_GENERIC_TRUE@    $(COINUTILSOBJDIR)/src/libCoinUtils.la
     572
     573# Finally, the -rpath flag is used by libtool to make sure that the shared
     574# library is found (in the lib install directory) when we are using dynamic
     575# libraries.
     576@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_LDFLAGS = -rpath $(libdir)
    542577
    543578# This line is necessary to allow VPATH compilation with MS compilers
     
    699734@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcFathom.Plo@am__quote@
    700735@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcFathomDynamicProgramming.Plo@am__quote@
     736@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGenBaB.Po@am__quote@
     737@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGenCbcParam.Po@am__quote@
     738@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGenCbcParamUtils.Po@am__quote@
     739@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGenCtlBlk.Po@am__quote@
     740@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGenOsiParam.Po@am__quote@
     741@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGenOsiParamUtils.Po@am__quote@
     742@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGenParam.Po@am__quote@
     743@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGenParamUtils.Po@am__quote@
     744@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGenSolution.Po@am__quote@
     745@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGenSolvers.Po@am__quote@
     746@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGeneric.Po@am__quote@
    701747@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristic.Plo@am__quote@
    702748@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicFPump.Plo@am__quote@
     
    705751@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicRINS.Plo@am__quote@
    706752@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcLinked.Plo@am__quote@
    707 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcMain.Po@am__quote@
    708753@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcMessage.Plo@am__quote@
    709754@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcModel.Plo@am__quote@
    710755@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcNode.Plo@am__quote@
    711 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcParam.Po@am__quote@
    712756@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSolver.Plo@am__quote@
    713757@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcStatistics.Plo@am__quote@
     
    718762@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cbc_ampl.Plo@am__quote@
    719763@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinSolve.Po@am__quote@
    720 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTest.Po@am__quote@
    721764@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTestClp.Po@am__quote@
    722765
Note: See TracChangeset for help on using the changeset viewer.