Ignore:
Timestamp:
Mar 30, 2007 9:08:00 AM (13 years ago)
Author:
forrest
Message:

for lou and callable cbcmain

File:
1 edited

Legend:

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

    r526 r587  
    4242        CbcModel.cpp CbcModel.hpp \
    4343        CbcNode.cpp CbcNode.hpp \
     44        CbcSolver.cpp CbcCbcParam.cpp \
    4445        CbcStatistics.cpp CbcStatistics.hpp \
    4546        CbcStrategy.cpp CbcStrategy.hpp \
     
    4950## If we have the Ampl solver library, we need to add additional things
    5051## also see lower down
    51 #if COIN_HAS_ASL
    52 #libCbc_la_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    53 #endif
     52## new idea is to add in source code anyway
     53libCbc_la_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    5454
    5555# This is for libtool (on Windows)
     
    6868        CbcMain.cpp \
    6969        CbcParam.cpp CbcParam.hpp \
    70         CbcCbcParam.cpp \
    7170        unitTest.cpp
    7271
     
    182181cbc_SOURCES = \
    183182        CoinSolve.cpp \
    184         CbcCbcParam.cpp \
    185183        unitTestClp.cpp
    186184
     
    200198# If we have the Ampl solver library, we need to add additional things
    201199if COIN_HAS_ASL
    202 cbc_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
     200#cbc_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    203201cbc_LDADD += $(ASLLIB)
    204202AM_CPPFLAGS += $(ASL_CPPFLAGS)
Note: See TracChangeset for help on using the changeset viewer.