Ignore:
Timestamp:
Dec 9, 2009 12:29:05 PM (10 years ago)
Author:
bjarni
Message:

Updated Makefile.am to add CbcSolverHeuristics?.cpp/.hpp and ran autotools

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

Legend:

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

    r1368 r1385  
    9595        ClpConstraintAmpl.hpp ClpAmplObjective.hpp ClpAmplStuff.cpp \
    9696        CbcLinked.cpp CbcLinked.hpp \
    97         unitTestClp.cpp CbcSolver.cpp
     97        unitTestClp.cpp CbcSolver.cpp \
     98        CbcSolverHeuristics.cpp CbcSolverHeuristics.hpp
    9899
    99100#Stefan: added unitTestClp.cpp because CbcSolver defines reference to it
     
    402403        CbcStrategy.hpp \
    403404        CbcSolver.hpp \
     405        CbcSolverHeuristics.hpp \
    404406        CbcSOS.hpp \
    405407        CbcSubProblem.hpp \
  • branches/sandbox/Cbc/src/Makefile.in

    r1368 r1385  
    188188libCbcSolver_la_LIBADD =
    189189am_libCbcSolver_la_OBJECTS = CbcCbcParam.lo Cbc_ampl.lo \
    190         ClpAmplStuff.lo CbcLinked.lo unitTestClp.lo CbcSolver.lo
     190        ClpAmplStuff.lo CbcLinked.lo unitTestClp.lo CbcSolver.lo \
     191        CbcSolverHeuristics.lo
    191192libCbcSolver_la_OBJECTS = $(am_libCbcSolver_la_OBJECTS)
    192193@COIN_HAS_CLP_TRUE@am__EXEEXT_1 = cbc$(EXEEXT)
     
    592593        ClpConstraintAmpl.hpp ClpAmplObjective.hpp ClpAmplStuff.cpp \
    593594        CbcLinked.cpp CbcLinked.hpp \
    594         unitTestClp.cpp CbcSolver.cpp
     595        unitTestClp.cpp CbcSolver.cpp \
     596        CbcSolverHeuristics.cpp CbcSolverHeuristics.hpp
    595597
    596598
     
    762764        CbcStrategy.hpp \
    763765        CbcSolver.hpp \
     766        CbcSolverHeuristics.hpp \
    764767        CbcSOS.hpp \
    765768        CbcSubProblem.hpp \
     
    953956@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSimpleIntegerPseudoCost.Plo@am__quote@
    954957@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSolver.Plo@am__quote@
     958@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSolverHeuristics.Plo@am__quote@
    955959@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcStatistics.Plo@am__quote@
    956960@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcStrategy.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.