Changeset 443


Ignore:
Timestamp:
Oct 9, 2006 5:13:54 PM (13 years ago)
Author:
andreasw
Message:

merged changeset 442 from stable/1.1 into branches/devel

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

Legend:

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

    r439 r443  
    1919# List all source files for this library, including headers
    2020libCbc_la_SOURCES = \
     21        Cbc_C_Interface.cpp Cbc_C_Interface.h \
    2122        CbcConfig.h \
    2223        CbcBranchActual.cpp CbcBranchActual.hpp \
     
    237238include_HEADERS = \
    238239        ../inc/config_cbc.h \
     240        Cbc_C_Interface.h \
    239241        CbcBranchActual.hpp \
    240242        CbcBranchBase.hpp \
  • branches/devel/Cbc/src/Makefile.in

    r439 r443  
    140140LTLIBRARIES = $(lib_LTLIBRARIES)
    141141libCbc_la_LIBADD =
    142 am_libCbc_la_OBJECTS = CbcBranchActual.lo CbcBranchBase.lo \
    143         CbcBranchCut.lo CbcBranchDynamic.lo CbcBranchLotsize.lo \
    144         CbcCompareActual.lo CbcCountRowCut.lo CbcCutGenerator.lo \
    145         CbcEventHandler.lo CbcFathom.lo CbcFathomDynamicProgramming.lo \
    146         CbcHeuristic.lo CbcHeuristicFPump.lo CbcHeuristicGreedy.lo \
     142am_libCbc_la_OBJECTS = Cbc_C_Interface.lo CbcBranchActual.lo \
     143        CbcBranchBase.lo CbcBranchCut.lo CbcBranchDynamic.lo \
     144        CbcBranchLotsize.lo CbcCompareActual.lo CbcCountRowCut.lo \
     145        CbcCutGenerator.lo CbcEventHandler.lo CbcFathom.lo \
     146        CbcFathomDynamicProgramming.lo CbcHeuristic.lo \
     147        CbcHeuristicFPump.lo CbcHeuristicGreedy.lo \
    147148        CbcHeuristicLocal.lo CbcMessage.lo CbcModel.lo CbcNode.lo \
    148149        CbcStatistics.lo CbcStrategy.lo CbcTree.lo CbcTreeLocal.lo
     
    440441# List all source files for this library, including headers
    441442libCbc_la_SOURCES = \
     443        Cbc_C_Interface.cpp Cbc_C_Interface.h \
    442444        CbcConfig.h \
    443445        CbcBranchActual.cpp CbcBranchActual.hpp \
     
    554556include_HEADERS = \
    555557        ../inc/config_cbc.h \
     558        Cbc_C_Interface.h \
    556559        CbcBranchActual.hpp \
    557560        CbcBranchBase.hpp \
     
    710713@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcTree.Plo@am__quote@
    711714@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcTreeLocal.Plo@am__quote@
     715@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cbc_C_Interface.Plo@am__quote@
    712716@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cbc_ampl.Po@am__quote@
    713717@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinSolve.Po@am__quote@
Note: See TracChangeset for help on using the changeset viewer.