Changeset 526 for branches


Ignore:
Timestamp:
Jan 28, 2007 6:39:16 PM (13 years ago)
Author:
andreasw
Message:

do no longer include Cbc_ampl.cpp in libCbc, it is only required executable. Otherwise, anything that uses libCbc will also need AMPL; e.g., the Bonmin test crashes at the moment

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

Legend:

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

    r502 r526  
    4747        CbcLinked.cpp CbcLinked.hpp \
    4848        CbcTreeLocal.cpp CbcTreeLocal.hpp
    49 # If we have the Ampl solver library, we need to add additional things
    50 # also see lower down
    51 if COIN_HAS_ASL
    52 libCbc_la_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    53 endif
     49## If we have the Ampl solver library, we need to add additional things
     50## also see lower down
     51#if COIN_HAS_ASL
     52#libCbc_la_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
     53#endif
    5454
    5555# This is for libtool (on Windows)
     
    164164cbc_generic_LDFLAGS = -rpath $(libdir)
    165165
    166 # If we have the Ampl solver library, we need to add additional things
    167 if COIN_HAS_ASL
    168 cbc_generic_LDADD += $(ASLLIB)
    169 endif
     166## If we have the Ampl solver library, we need to add additional things
     167#if COIN_HAS_ASL
     168#cbc_generic_LDADD += $(ASLLIB)
     169#endif
    170170
    171171########################################################################
     
    200200# If we have the Ampl solver library, we need to add additional things
    201201if COIN_HAS_ASL
     202cbc_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    202203cbc_LDADD += $(ASLLIB)
    203204AM_CPPFLAGS += $(ASL_CPPFLAGS)
  • branches/devel/Cbc/src/Makefile.in

    r502 r526  
    4545build_triplet = @build@
    4646host_triplet = @host@
    47 # If we have the Ampl solver library, we need to add additional things
    48 # also see lower down
    49 @COIN_HAS_ASL_TRUE@am__append_1 = Cbc_ampl.cpp Cbc_ampl.h
    5047bin_PROGRAMS = cbc-generic$(EXEEXT) $(am__EXEEXT_1)
    5148
    5249# List all additionally required solver and Osi libraries
    53 @COIN_HAS_CLP_TRUE@am__append_2 = -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
     50@COIN_HAS_CLP_TRUE@am__append_1 = -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    5451@COIN_HAS_CLP_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    5552@COIN_HAS_CLP_TRUE@     -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
    5653
    57 @COIN_HAS_CLP_TRUE@am__append_3 = $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     54@COIN_HAS_CLP_TRUE@am__append_2 = $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    5855@COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la
    5956
    60 @COIN_HAS_CLP_TRUE@am__append_4 = `cat $(CLPOBJDIR)/clp_addlibs.txt`
    61 @COIN_HAS_CPX_TRUE@am__append_5 = -I`$(CYGPATH_W) $(CPXINCDIR)` \
     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)` \
    6259@COIN_HAS_CPX_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    6360
    64 @COIN_HAS_CPX_TRUE@am__append_6 = $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    65 @COIN_HAS_DYLP_TRUE@am__append_7 = -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/DylpStdLib` \
     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` \
    6663@COIN_HAS_DYLP_TRUE@        -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/Dylp` \
    6764@COIN_HAS_DYLP_TRUE@        -I`$(CYGPATH_W) $(DYLPOBJDIR)/inc` \
    6865@COIN_HAS_DYLP_TRUE@    -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiDylp`
    6966
    70 @COIN_HAS_DYLP_TRUE@am__append_8 = $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
     67@COIN_HAS_DYLP_TRUE@am__append_7 = $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    7168@COIN_HAS_DYLP_TRUE@    $(DYLPOBJDIR)/src/Dylp/libDylp.la
    7269
    73 @COIN_HAS_DYLP_TRUE@am__append_9 = `cat $(DYLPOBJDIR)/dylp_addlibs.txt`
    74 @COIN_HAS_FMP_TRUE@am__append_10 = -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiFmp`
    75 @COIN_HAS_FMP_TRUE@am__append_11 = $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
    76 @COIN_HAS_GLPK_TRUE@am__append_12 = -I`$(CYGPATH_W) $(GLPKINCDIR)` \
     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)` \
    7774@COIN_HAS_GLPK_TRUE@    -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiGlpk`
    7875
    79 @COIN_HAS_GLPK_TRUE@am__append_13 = $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
    80 @COIN_HAS_MSK_TRUE@am__append_14 = -I`$(CYGPATH_W) $(MSKINCDIR)` \
     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)` \
    8178@COIN_HAS_MSK_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiMsk`
    8279
    83 @COIN_HAS_MSK_TRUE@am__append_15 = $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    84 @COIN_HAS_OSL_TRUE@am__append_16 = -I`$(CYGPATH_W) $(OSLINCDIR)` \
     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)` \
    8582@COIN_HAS_OSL_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
    8683
    87 @COIN_HAS_OSL_TRUE@am__append_17 = $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    88 @COIN_HAS_SPX_TRUE@am__append_18 = -I`$(CYGPATH_W) $(SPXINCDIR)` \
     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)` \
    8986@COIN_HAS_SPX_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSpx`
    9087
    91 @COIN_HAS_SPX_TRUE@am__append_19 = $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    92 @COIN_HAS_SYM_TRUE@am__append_20 = -I`$(CYGPATH_W) $(SYMSRCDIR)/src` \
     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` \
    9390@COIN_HAS_SYM_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSym`
    9491
    95 @COIN_HAS_SYM_TRUE@am__append_21 = $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
     92@COIN_HAS_SYM_TRUE@am__append_20 = $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    9693@COIN_HAS_SYM_TRUE@     $(SYMOBJDIR)/src/libSym.la
    9794
    98 @COIN_HAS_SYM_TRUE@am__append_22 = `cat $(SYMOBJDIR)/sym_addlibs.txt`
    99 @COIN_HAS_VOL_TRUE@am__append_23 = -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
     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` \
    10097@COIN_HAS_VOL_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiVol`
    10198
    102 @COIN_HAS_VOL_TRUE@am__append_24 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
     99@COIN_HAS_VOL_TRUE@am__append_23 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    103100@COIN_HAS_VOL_TRUE@     $(VOLOBJDIR)/src/libVol.la
    104101
    105 @COIN_HAS_VOL_TRUE@am__append_25 = `cat $(VOLOBJDIR)/vol_addlibs.txt`
    106 @COIN_HAS_XPR_TRUE@am__append_26 = -I`$(CYGPATH_W) $(XPRINCDIR)` \
     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)` \
    107104@COIN_HAS_XPR_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr`
    108105
    109 @COIN_HAS_XPR_TRUE@am__append_27 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    110 
    111 # If we have the Ampl solver library, we need to add additional things
    112 @COIN_HAS_ASL_TRUE@am__append_28 = $(ASLLIB)
     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
    113111
    114112########################################################################
     
    118116# Name of the executable compiled in this directory.  We want it to be
    119117# installed in the 'bin' directory
    120 @COIN_HAS_CLP_TRUE@am__append_29 = cbc
     118@COIN_HAS_CLP_TRUE@am__append_27 = cbc
    121119
    122120# If we have the Ampl solver library, we need to add additional things
    123 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_30 = $(ASLLIB)
    124 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_31 = $(ASL_CPPFLAGS)
     121@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_28 = Cbc_ampl.cpp Cbc_ampl.h
     122@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_29 = $(ASLLIB)
     123@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_30 = $(ASL_CPPFLAGS)
    125124subdir = src
    126125DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     
    145144LTLIBRARIES = $(lib_LTLIBRARIES)
    146145libCbc_la_LIBADD =
    147 am__libCbc_la_SOURCES_DIST = Cbc_C_Interface.cpp Cbc_C_Interface.h \
    148         CbcConfig.h CbcBranchActual.cpp CbcBranchActual.hpp \
    149         CbcBranchBase.cpp CbcBranchBase.hpp CbcBranchCut.cpp \
    150         CbcBranchCut.hpp CbcBranchDynamic.cpp CbcBranchDynamic.hpp \
    151         CbcBranchLotsize.cpp CbcBranchLotsize.hpp CbcCompareActual.cpp \
    152         CbcCompareActual.hpp CbcCompareBase.hpp CbcCountRowCut.cpp \
    153         CbcCountRowCut.hpp CbcCutGenerator.cpp CbcCutGenerator.hpp \
    154         CbcEventHandler.cpp CbcEventHandler.hpp CbcFathom.cpp \
    155         CbcFathom.hpp CbcFathomDynamicProgramming.cpp \
    156         CbcFathomDynamicProgramming.hpp CbcFeasibilityBase.hpp \
    157         CbcHeuristic.cpp CbcHeuristic.hpp CbcHeuristicFPump.cpp \
    158         CbcHeuristicFPump.hpp CbcHeuristicGreedy.cpp \
    159         CbcHeuristicGreedy.hpp CbcHeuristicLocal.cpp \
    160         CbcHeuristicLocal.hpp CbcHeuristicRINS.cpp \
    161         CbcHeuristicRINS.hpp CbcMessage.cpp CbcMessage.hpp \
    162         CbcModel.cpp CbcModel.hpp CbcNode.cpp CbcNode.hpp \
    163         CbcStatistics.cpp CbcStatistics.hpp CbcStrategy.cpp \
    164         CbcStrategy.hpp CbcTree.cpp CbcTree.hpp CbcLinked.cpp \
    165         CbcLinked.hpp CbcTreeLocal.cpp CbcTreeLocal.hpp Cbc_ampl.cpp \
    166         Cbc_ampl.h
    167 @COIN_HAS_ASL_TRUE@am__objects_1 = Cbc_ampl.lo
    168146am_libCbc_la_OBJECTS = Cbc_C_Interface.lo CbcBranchActual.lo \
    169147        CbcBranchBase.lo CbcBranchCut.lo CbcBranchDynamic.lo \
     
    174152        CbcHeuristicLocal.lo CbcHeuristicRINS.lo CbcMessage.lo \
    175153        CbcModel.lo CbcNode.lo CbcStatistics.lo CbcStrategy.lo \
    176         CbcTree.lo CbcLinked.lo CbcTreeLocal.lo $(am__objects_1)
     154        CbcTree.lo CbcLinked.lo CbcTreeLocal.lo
    177155libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS)
    178156@COIN_HAS_CLP_TRUE@am__EXEEXT_1 = cbc$(EXEEXT)
    179157binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    180158PROGRAMS = $(bin_PROGRAMS)
    181 am__cbc_SOURCES_DIST = CoinSolve.cpp CbcCbcParam.cpp unitTestClp.cpp
     159am__cbc_SOURCES_DIST = CoinSolve.cpp CbcCbcParam.cpp unitTestClp.cpp \
     160        Cbc_ampl.cpp Cbc_ampl.h
     161@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__objects_1 =  \
     162@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@  Cbc_ampl.$(OBJEXT)
    182163@COIN_HAS_CLP_TRUE@am_cbc_OBJECTS = CoinSolve.$(OBJEXT) \
    183 @COIN_HAS_CLP_TRUE@     CbcCbcParam.$(OBJEXT) unitTestClp.$(OBJEXT)
     164@COIN_HAS_CLP_TRUE@     CbcCbcParam.$(OBJEXT) unitTestClp.$(OBJEXT) \
     165@COIN_HAS_CLP_TRUE@     $(am__objects_1)
    184166cbc_OBJECTS = $(am_cbc_OBJECTS)
    185167am__DEPENDENCIES_1 =
     
    222204@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_13 =  \
    223205@COIN_HAS_XPR_TRUE@     $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    224 @COIN_HAS_ASL_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1)
    225206cbc_generic_DEPENDENCIES = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    226207        $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la $(am__DEPENDENCIES_3) \
     
    231212        $(am__DEPENDENCIES_12) $(am__DEPENDENCIES_13) \
    232213        $(OSIOBJDIR)/src/libOsi.la \
    233         $(COINUTILSOBJDIR)/src/libCoinUtils.la $(am__DEPENDENCIES_14)
     214        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    234215depcomp = $(SHELL) $(top_srcdir)/../depcomp
    235216am__depfiles_maybe = depfiles
     
    251232        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    252233SOURCES = $(libCbc_la_SOURCES) $(cbc_SOURCES) $(cbc_generic_SOURCES)
    253 DIST_SOURCES = $(am__libCbc_la_SOURCES_DIST) $(am__cbc_SOURCES_DIST) \
     234DIST_SOURCES = $(libCbc_la_SOURCES) $(am__cbc_SOURCES_DIST) \
    254235        $(cbc_generic_SOURCES)
    255236includeHEADERS_INSTALL = $(INSTALL_HEADER)
     
    358339LIBEXT = @LIBEXT@
    359340LIBOBJS = @LIBOBJS@
    360 LIBS = @LIBS@ $(am__append_4) $(am__append_9) $(am__append_22) \
    361         $(am__append_25) `cat $(OSIOBJDIR)/osi_addlibs.txt` `cat \
     341LIBS = @LIBS@ $(am__append_3) $(am__append_8) $(am__append_21) \
     342        $(am__append_24) `cat $(OSIOBJDIR)/osi_addlibs.txt` `cat \
    362343        $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
    363344LIBTOOL = @LIBTOOL@
     
    407388abs_lib_dir = @abs_lib_dir@
    408389abs_source_dir = @abs_source_dir@
     390ac_c_preproc_warn_flag = @ac_c_preproc_warn_flag@
    409391ac_ct_AR = @ac_ct_AR@
    410392ac_ct_CC = @ac_ct_CC@
     
    413395ac_ct_RANLIB = @ac_ct_RANLIB@
    414396ac_ct_STRIP = @ac_ct_STRIP@
     397ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    415398am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    416399am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
     
    464447
    465448# List all source files for this library, including headers
    466 libCbc_la_SOURCES = Cbc_C_Interface.cpp Cbc_C_Interface.h CbcConfig.h \
    467         CbcBranchActual.cpp CbcBranchActual.hpp CbcBranchBase.cpp \
    468         CbcBranchBase.hpp CbcBranchCut.cpp CbcBranchCut.hpp \
    469         CbcBranchDynamic.cpp CbcBranchDynamic.hpp CbcBranchLotsize.cpp \
    470         CbcBranchLotsize.hpp CbcCompareActual.cpp CbcCompareActual.hpp \
    471         CbcCompareBase.hpp CbcCountRowCut.cpp CbcCountRowCut.hpp \
    472         CbcCutGenerator.cpp CbcCutGenerator.hpp CbcEventHandler.cpp \
    473         CbcEventHandler.hpp CbcFathom.cpp CbcFathom.hpp \
    474         CbcFathomDynamicProgramming.cpp \
    475         CbcFathomDynamicProgramming.hpp CbcFeasibilityBase.hpp \
    476         CbcHeuristic.cpp CbcHeuristic.hpp CbcHeuristicFPump.cpp \
    477         CbcHeuristicFPump.hpp CbcHeuristicGreedy.cpp \
    478         CbcHeuristicGreedy.hpp CbcHeuristicLocal.cpp \
    479         CbcHeuristicLocal.hpp CbcHeuristicRINS.cpp \
    480         CbcHeuristicRINS.hpp CbcMessage.cpp CbcMessage.hpp \
    481         CbcModel.cpp CbcModel.hpp CbcNode.cpp CbcNode.hpp \
    482         CbcStatistics.cpp CbcStatistics.hpp CbcStrategy.cpp \
    483         CbcStrategy.hpp CbcTree.cpp CbcTree.hpp CbcLinked.cpp \
    484         CbcLinked.hpp CbcTreeLocal.cpp CbcTreeLocal.hpp \
    485         $(am__append_1)
     449libCbc_la_SOURCES = \
     450        Cbc_C_Interface.cpp Cbc_C_Interface.h \
     451        CbcConfig.h \
     452        CbcBranchActual.cpp CbcBranchActual.hpp \
     453        CbcBranchBase.cpp CbcBranchBase.hpp \
     454        CbcBranchCut.cpp CbcBranchCut.hpp \
     455        CbcBranchDynamic.cpp CbcBranchDynamic.hpp \
     456        CbcBranchLotsize.cpp CbcBranchLotsize.hpp \
     457        CbcCompareActual.cpp CbcCompareActual.hpp \
     458        CbcCompareBase.hpp \
     459        CbcCountRowCut.cpp CbcCountRowCut.hpp \
     460        CbcCutGenerator.cpp CbcCutGenerator.hpp \
     461        CbcEventHandler.cpp CbcEventHandler.hpp \
     462        CbcFathom.cpp CbcFathom.hpp \
     463        CbcFathomDynamicProgramming.cpp CbcFathomDynamicProgramming.hpp \
     464        CbcFeasibilityBase.hpp \
     465        CbcHeuristic.cpp CbcHeuristic.hpp \
     466        CbcHeuristicFPump.cpp CbcHeuristicFPump.hpp \
     467        CbcHeuristicGreedy.cpp CbcHeuristicGreedy.hpp \
     468        CbcHeuristicLocal.cpp CbcHeuristicLocal.hpp \
     469        CbcHeuristicRINS.cpp CbcHeuristicRINS.hpp \
     470        CbcMessage.cpp CbcMessage.hpp \
     471        CbcModel.cpp CbcModel.hpp \
     472        CbcNode.cpp CbcNode.hpp \
     473        CbcStatistics.cpp CbcStatistics.hpp \
     474        CbcStrategy.cpp CbcStrategy.hpp \
     475        CbcTree.cpp CbcTree.hpp \
     476        CbcLinked.cpp CbcLinked.hpp \
     477        CbcTreeLocal.cpp CbcTreeLocal.hpp
     478
     479#if COIN_HAS_ASL
     480#libCbc_la_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
     481#endif
    486482
    487483# This is for libtool (on Windows)
     
    498494# Finally the Osi Coin library (many of the above need it)
    499495cbc_generic_LDADD = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    500         $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la $(am__append_3) \
    501         $(am__append_6) $(am__append_8) $(am__append_11) \
    502         $(am__append_13) $(am__append_15) $(am__append_17) \
    503         $(am__append_19) $(am__append_21) $(am__append_24) \
    504         $(am__append_27) $(OSIOBJDIR)/src/libOsi.la \
    505         $(COINUTILSOBJDIR)/src/libCoinUtils.la $(am__append_28)
     496        $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la $(am__append_2) \
     497        $(am__append_5) $(am__append_7) $(am__append_10) \
     498        $(am__append_12) $(am__append_14) $(am__append_16) \
     499        $(am__append_18) $(am__append_20) $(am__append_23) \
     500        $(am__append_26) $(OSIOBJDIR)/src/libOsi.la \
     501        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    506502
    507503########################################################################
     
    515511
    516512# List additional defines
    517 AM_CPPFLAGS = -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc` $(am__append_2) \
    518         $(am__append_5) $(am__append_7) $(am__append_10) \
    519         $(am__append_12) $(am__append_14) $(am__append_16) \
    520         $(am__append_18) $(am__append_20) $(am__append_23) \
    521         $(am__append_26) $(am__append_31) -I`$(CYGPATH_W) \
     513AM_CPPFLAGS = -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc` $(am__append_1) \
     514        $(am__append_4) $(am__append_6) $(am__append_9) \
     515        $(am__append_11) $(am__append_13) $(am__append_15) \
     516        $(am__append_17) $(am__append_19) $(am__append_22) \
     517        $(am__append_25) $(am__append_30) -I`$(CYGPATH_W) \
    522518        $(CGLSRCDIR)/src` -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` \
    523519        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglDuplicateRow` \
     
    544540
    545541# List all source files for this executable, including headers
    546 @COIN_HAS_CLP_TRUE@cbc_SOURCES = \
    547 @COIN_HAS_CLP_TRUE@     CoinSolve.cpp \
    548 @COIN_HAS_CLP_TRUE@     CbcCbcParam.cpp \
    549 @COIN_HAS_CLP_TRUE@     unitTestClp.cpp
    550 
     542@COIN_HAS_CLP_TRUE@cbc_SOURCES = CoinSolve.cpp CbcCbcParam.cpp \
     543@COIN_HAS_CLP_TRUE@     unitTestClp.cpp $(am__append_28)
    551544
    552545# Additional COIN libraries
     
    556549@COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la \
    557550@COIN_HAS_CLP_TRUE@     $(COINUTILSOBJDIR)/src/libCoinUtils.la \
    558 @COIN_HAS_CLP_TRUE@     $(am__append_30)
     551@COIN_HAS_CLP_TRUE@     $(am__append_29)
    559552
    560553# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    737730@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcTreeLocal.Plo@am__quote@
    738731@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cbc_C_Interface.Plo@am__quote@
    739 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cbc_ampl.Plo@am__quote@
     732@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cbc_ampl.Po@am__quote@
    740733@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinSolve.Po@am__quote@
    741734@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTest.Po@am__quote@
Note: See TracChangeset for help on using the changeset viewer.