Changeset 1399 for branches/sandbox


Ignore:
Timestamp:
Dec 11, 2009 12:01:27 AM (10 years ago)
Author:
bjarni
Message:

Updated Makefile.am in sandbox adding CbcSolverExpandKnapsack?.cpp (and .hpp)

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

Legend:

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

    r1396 r1399  
    9999        unitTestClp.cpp CbcSolver.cpp \
    100100        CbcSolverHeuristics.cpp CbcSolverHeuristics.hpp \
    101         CbcSolverAnalyze.cpp CbcSolverAnalyze.hpp
     101        CbcSolverAnalyze.cpp CbcSolverAnalyze.hpp \
     102        CbcSolverExpandKnapsack.cpp CbcSolverExpandKnapsack.hpp
    102103
    103104#Stefan: added unitTestClp.cpp because CbcSolver defines reference to it
  • branches/sandbox/Cbc/src/Makefile.in

    r1396 r1399  
    189189am_libCbcSolver_la_OBJECTS = CbcCbcParam.lo Cbc_ampl.lo CbcLinked.lo \
    190190        CbcLinkedUtils.lo unitTestClp.lo CbcSolver.lo \
    191         CbcSolverHeuristics.lo CbcSolverAnalyze.lo
     191        CbcSolverHeuristics.lo CbcSolverAnalyze.lo \
     192        CbcSolverExpandKnapsack.lo
    192193libCbcSolver_la_OBJECTS = $(am_libCbcSolver_la_OBJECTS)
    193194@COIN_HAS_CLP_TRUE@am__EXEEXT_1 = cbc$(EXEEXT)
     
    596597        unitTestClp.cpp CbcSolver.cpp \
    597598        CbcSolverHeuristics.cpp CbcSolverHeuristics.hpp \
    598         CbcSolverAnalyze.cpp CbcSolverAnalyze.hpp
     599        CbcSolverAnalyze.cpp CbcSolverAnalyze.hpp \
     600        CbcSolverExpandKnapsack.cpp CbcSolverExpandKnapsack.hpp
    599601
    600602
     
    959961@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSolver.Plo@am__quote@
    960962@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSolverAnalyze.Plo@am__quote@
     963@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSolverExpandKnapsack.Plo@am__quote@
    961964@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSolverHeuristics.Plo@am__quote@
    962965@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcStatistics.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.