Ignore:
Timestamp:
Aug 17, 2007 1:31:56 PM (12 years ago)
Author:
andreasw
Message:

moved all ASL dependent code into new installable library libCbcSolver

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/BSP/trunk/Cbc/src/Makefile.am

    r752 r761  
    1515# Name of the library compiled in this directory.  We want it to be installed
    1616# in the 'lib' directory
    17 lib_LTLIBRARIES = libCbc.la
     17lib_LTLIBRARIES = libCbc.la libCbcSolver.la
    1818
    1919# List all source files for this library, including headers
     
    4242        CbcModel.cpp CbcModel.hpp \
    4343        CbcNode.cpp CbcNode.hpp \
    44         CbcSolver.cpp CbcCbcParam.cpp \
     44        CbcCbcParam.cpp \
    4545        CbcStatistics.cpp CbcStatistics.hpp \
    4646        CbcStrategy.cpp CbcStrategy.hpp \
    4747        CbcTree.cpp CbcTree.hpp \
     48        CbcTreeLocal.cpp CbcTreeLocal.hpp
     49
     50libCbcSolver_la_SOURCES = \
     51        Cbc_ampl.cpp Cbc_ampl.h \
     52        ClpConstraintAmpl.hpp ClpAmplObjective.hpp ClpAmplStuff.cpp \
    4853        CbcLinked.cpp CbcLinked.hpp \
    49         CbcTreeLocal.cpp CbcTreeLocal.hpp \
    50         ClpConstraintAmpl.hpp ClpAmplObjective.hpp ClpAmplStuff.cpp \
    51         unitTestClp.cpp
     54        unitTestClp.cpp CbcSolver.cpp
     55
    5256#Stefan: added unitTestClp.cpp because CbcSolver defines reference to it
    5357
     
    5559## also see lower down
    5660## new idea is to add in source code anyway
    57 libCbc_la_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
     61##libCbc_la_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    5862
    5963
     
    6165
    6266libCbc_la_LDFLAGS = $(LT_LDFLAGS)
     67libCbcSolver_la_LDFLAGS = $(LT_LDFLAGS)
    6368
    6469# Some common setup for cbc and cbc-generic.
     
    8792
    8893# Additional COIN libraries
    89 cbc_LDADD = libCbc.la \
     94cbc_LDADD = libCbcSolver.la \
     95        libCbc.la \
    9096        $(CGLOBJDIR)/src/libCgl.la \
    9197        $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     
    140146        CbcGenSolvers.cpp
    141147
    142 cbc_generic_LDADD = libCbc.la \
     148cbc_generic_LDADD = libCbcSolver.la \
     149        libCbc.la \
    143150        $(CGLOBJDIR)/src/libCgl.la
    144151
Note: See TracChangeset for help on using the changeset viewer.