Ignore:
Timestamp:
Jun 26, 2007 5:59:58 AM (12 years ago)
Author:
forrest
Message:

update branches/devel for threads

File:
1 edited

Legend:

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

    r618 r642  
    164164        CbcModel.lo CbcNode.lo CbcSolver.lo CbcCbcParam.lo \
    165165        CbcStatistics.lo CbcStrategy.lo CbcTree.lo CbcLinked.lo \
    166         CbcTreeLocal.lo Cbc_ampl.lo
     166        CbcTreeLocal.lo ClpAmplStuff.lo Cbc_ampl.lo
    167167libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS)
    168168@COIN_HAS_CLP_TRUE@am__EXEEXT_1 = cbc$(EXEEXT)
     
    491491        CbcStatistics.hpp CbcStrategy.cpp CbcStrategy.hpp CbcTree.cpp \
    492492        CbcTree.hpp CbcLinked.cpp CbcLinked.hpp CbcTreeLocal.cpp \
    493         CbcTreeLocal.hpp Cbc_ampl.cpp Cbc_ampl.h
     493        CbcTreeLocal.hpp ClpConstraintAmpl.hpp ClpAmplObjective.hpp \
     494        ClpAmplStuff.cpp Cbc_ampl.cpp Cbc_ampl.h
    494495
    495496# This is for libtool (on Windows)
     
    613614        CbcTree.hpp \
    614615        CbcLinked.hpp \
    615         CbcTreeLocal.hpp
     616        CbcTreeLocal.hpp \
     617        ClpConstraintAmpl.hpp \
     618        ClpAmplObjective.hpp
    616619
    617620
     
    765768@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cbc_C_Interface.Plo@am__quote@
    766769@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cbc_ampl.Plo@am__quote@
     770@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpAmplStuff.Plo@am__quote@
    767771@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinSolve.Po@am__quote@
    768772@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTestClp.Po@am__quote@
Note: See TracChangeset for help on using the changeset viewer.