Ignore:
Timestamp:
Mar 10, 2014 5:58:20 PM (5 years ago)
Author:
mlubin
Message:

More C interface work. Move C interface to libCbcSolver so that we can use CbcMain0 and CbcMain1.

File:
1 edited

Legend:

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

    r2000 r2016  
    9292@DEPENDENCY_LINKING_TRUE@libCbc_la_DEPENDENCIES =  \
    9393@DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1)
    94 am_libCbc_la_OBJECTS = Cbc_C_Interface.lo CbcBranchAllDifferent.lo \
    95         CbcBranchCut.lo CbcBranchDecision.lo \
    96         CbcBranchDefaultDecision.lo CbcBranchDynamic.lo \
    97         CbcBranchingObject.lo CbcBranchLotsize.lo \
     94am_libCbc_la_OBJECTS = CbcBranchAllDifferent.lo CbcBranchCut.lo \
     95        CbcBranchDecision.lo CbcBranchDefaultDecision.lo \
     96        CbcBranchDynamic.lo CbcBranchingObject.lo CbcBranchLotsize.lo \
    9897        CbcBranchToFixLots.lo CbcCompareDefault.lo CbcCompareDepth.lo \
    9998        CbcCompareEstimate.lo CbcCompareObjective.lo CbcConsequence.lo \
     
    121120@DEPENDENCY_LINKING_TRUE@libCbcSolver_la_DEPENDENCIES =  \
    122121@DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1) libCbc.la
    123 am_libCbcSolver_la_OBJECTS = CbcCbcParam.lo Cbc_ampl.lo CbcLinked.lo \
    124         CbcLinkedUtils.lo unitTestClp.lo CbcSolver.lo \
    125         CbcSolverHeuristics.lo CbcSolverAnalyze.lo CbcMipStartIO.lo \
    126         CbcSolverExpandKnapsack.lo
     122am_libCbcSolver_la_OBJECTS = Cbc_C_Interface.lo CbcCbcParam.lo \
     123        Cbc_ampl.lo CbcLinked.lo CbcLinkedUtils.lo unitTestClp.lo \
     124        CbcSolver.lo CbcSolverHeuristics.lo CbcSolverAnalyze.lo \
     125        CbcMipStartIO.lo CbcSolverExpandKnapsack.lo
    127126libCbcSolver_la_OBJECTS = $(am_libCbcSolver_la_OBJECTS)
    128127@COIN_HAS_CLP_TRUE@am__EXEEXT_1 = cbc$(EXEEXT)
     
    514513# List all source files for this library, including headers
    515514libCbc_la_SOURCES = \
    516         Cbc_C_Interface.cpp Cbc_C_Interface.h \
    517515        CbcConfig.h \
    518516        CbcBranchActual.hpp \
     
    589587
    590588libCbcSolver_la_SOURCES = \
     589        Cbc_C_Interface.cpp Cbc_C_Interface.h \
    591590        CbcCbcParam.cpp \
    592591        Cbc_ampl.cpp Cbc_ampl.h \
Note: See TracChangeset for help on using the changeset viewer.