Changeset 761 for branches


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

Location:
branches/BSP/trunk/Cbc/src
Files:
2 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
  • branches/BSP/trunk/Cbc/src/Makefile.in

    r752 r761  
    164164        CbcHeuristicFPump.lo CbcHeuristicGreedy.lo \
    165165        CbcHeuristicLocal.lo CbcHeuristicRINS.lo CbcMessage.lo \
    166         CbcModel.lo CbcNode.lo CbcSolver.lo CbcCbcParam.lo \
    167         CbcStatistics.lo CbcStrategy.lo CbcTree.lo CbcLinked.lo \
    168         CbcTreeLocal.lo ClpAmplStuff.lo unitTestClp.lo Cbc_ampl.lo
     166        CbcModel.lo CbcNode.lo CbcCbcParam.lo CbcStatistics.lo \
     167        CbcStrategy.lo CbcTree.lo CbcTreeLocal.lo
    169168libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS)
     169libCbcSolver_la_LIBADD =
     170am_libCbcSolver_la_OBJECTS = Cbc_ampl.lo ClpAmplStuff.lo CbcLinked.lo \
     171        unitTestClp.lo CbcSolver.lo
     172libCbcSolver_la_OBJECTS = $(am_libCbcSolver_la_OBJECTS)
    170173@COIN_HAS_CLP_TRUE@am__EXEEXT_1 = cbc$(EXEEXT)
    171174@CBC_BUILD_CBC_GENERIC_TRUE@am__EXEEXT_2 = cbc-generic$(EXEEXT)
     
    178181@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_2 =  \
    179182@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@  $(am__DEPENDENCIES_1)
    180 @COIN_HAS_CLP_TRUE@cbc_DEPENDENCIES = libCbc.la \
     183@COIN_HAS_CLP_TRUE@cbc_DEPENDENCIES = libCbcSolver.la libCbc.la \
    181184@COIN_HAS_CLP_TRUE@     $(CGLOBJDIR)/src/libCgl.la \
    182185@COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     
    255258LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
    256259        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    257 SOURCES = $(libCbc_la_SOURCES) $(cbc_SOURCES) $(cbc_generic_SOURCES)
    258 DIST_SOURCES = $(libCbc_la_SOURCES) $(am__cbc_SOURCES_DIST) \
    259         $(am__cbc_generic_SOURCES_DIST)
     260SOURCES = $(libCbc_la_SOURCES) $(libCbcSolver_la_SOURCES) \
     261        $(cbc_SOURCES) $(cbc_generic_SOURCES)
     262DIST_SOURCES = $(libCbc_la_SOURCES) $(libCbcSolver_la_SOURCES) \
     263        $(am__cbc_SOURCES_DIST) $(am__cbc_generic_SOURCES_DIST)
    260264includeHEADERS_INSTALL = $(INSTALL_HEADER)
    261265HEADERS = $(include_HEADERS)
     
    474478# Name of the library compiled in this directory.  We want it to be installed
    475479# in the 'lib' directory
    476 lib_LTLIBRARIES = libCbc.la
     480lib_LTLIBRARIES = libCbc.la libCbcSolver.la
    477481
    478482# List all source files for this library, including headers
     483libCbc_la_SOURCES = \
     484        Cbc_C_Interface.cpp Cbc_C_Interface.h \
     485        CbcConfig.h \
     486        CbcBranchActual.cpp CbcBranchActual.hpp \
     487        CbcBranchBase.cpp CbcBranchBase.hpp \
     488        CbcBranchCut.cpp CbcBranchCut.hpp \
     489        CbcBranchDynamic.cpp CbcBranchDynamic.hpp \
     490        CbcBranchLotsize.cpp CbcBranchLotsize.hpp \
     491        CbcCompareActual.cpp CbcCompareActual.hpp \
     492        CbcCompareBase.hpp \
     493        CbcCountRowCut.cpp CbcCountRowCut.hpp \
     494        CbcCutGenerator.cpp CbcCutGenerator.hpp \
     495        CbcEventHandler.cpp CbcEventHandler.hpp \
     496        CbcFathom.cpp CbcFathom.hpp \
     497        CbcFathomDynamicProgramming.cpp CbcFathomDynamicProgramming.hpp \
     498        CbcFeasibilityBase.hpp \
     499        CbcHeuristic.cpp CbcHeuristic.hpp \
     500        CbcHeuristicFPump.cpp CbcHeuristicFPump.hpp \
     501        CbcHeuristicGreedy.cpp CbcHeuristicGreedy.hpp \
     502        CbcHeuristicLocal.cpp CbcHeuristicLocal.hpp \
     503        CbcHeuristicRINS.cpp CbcHeuristicRINS.hpp \
     504        CbcMessage.cpp CbcMessage.hpp \
     505        CbcModel.cpp CbcModel.hpp \
     506        CbcNode.cpp CbcNode.hpp \
     507        CbcCbcParam.cpp \
     508        CbcStatistics.cpp CbcStatistics.hpp \
     509        CbcStrategy.cpp CbcStrategy.hpp \
     510        CbcTree.cpp CbcTree.hpp \
     511        CbcTreeLocal.cpp CbcTreeLocal.hpp
     512
     513libCbcSolver_la_SOURCES = \
     514        Cbc_ampl.cpp Cbc_ampl.h \
     515        ClpConstraintAmpl.hpp ClpAmplObjective.hpp ClpAmplStuff.cpp \
     516        CbcLinked.cpp CbcLinked.hpp \
     517        unitTestClp.cpp CbcSolver.cpp
     518
     519
    479520#Stefan: added unitTestClp.cpp because CbcSolver defines reference to it
    480 libCbc_la_SOURCES = Cbc_C_Interface.cpp Cbc_C_Interface.h CbcConfig.h \
    481         CbcBranchActual.cpp CbcBranchActual.hpp CbcBranchBase.cpp \
    482         CbcBranchBase.hpp CbcBranchCut.cpp CbcBranchCut.hpp \
    483         CbcBranchDynamic.cpp CbcBranchDynamic.hpp CbcBranchLotsize.cpp \
    484         CbcBranchLotsize.hpp CbcCompareActual.cpp CbcCompareActual.hpp \
    485         CbcCompareBase.hpp CbcCountRowCut.cpp CbcCountRowCut.hpp \
    486         CbcCutGenerator.cpp CbcCutGenerator.hpp CbcEventHandler.cpp \
    487         CbcEventHandler.hpp CbcFathom.cpp CbcFathom.hpp \
    488         CbcFathomDynamicProgramming.cpp \
    489         CbcFathomDynamicProgramming.hpp CbcFeasibilityBase.hpp \
    490         CbcHeuristic.cpp CbcHeuristic.hpp CbcHeuristicFPump.cpp \
    491         CbcHeuristicFPump.hpp CbcHeuristicGreedy.cpp \
    492         CbcHeuristicGreedy.hpp CbcHeuristicLocal.cpp \
    493         CbcHeuristicLocal.hpp CbcHeuristicRINS.cpp \
    494         CbcHeuristicRINS.hpp CbcMessage.cpp CbcMessage.hpp \
    495         CbcModel.cpp CbcModel.hpp CbcNode.cpp CbcNode.hpp \
    496         CbcSolver.cpp CbcCbcParam.cpp CbcStatistics.cpp \
    497         CbcStatistics.hpp CbcStrategy.cpp CbcStrategy.hpp CbcTree.cpp \
    498         CbcTree.hpp CbcLinked.cpp CbcLinked.hpp CbcTreeLocal.cpp \
    499         CbcTreeLocal.hpp ClpConstraintAmpl.hpp ClpAmplObjective.hpp \
    500         ClpAmplStuff.cpp unitTestClp.cpp Cbc_ampl.cpp Cbc_ampl.h
    501521
    502522# This is for libtool (on Windows)
    503523libCbc_la_LDFLAGS = $(LT_LDFLAGS)
     524libCbcSolver_la_LDFLAGS = $(LT_LDFLAGS)
    504525
    505526########################################################################
     
    543564
    544565# Additional COIN libraries
    545 @COIN_HAS_CLP_TRUE@cbc_LDADD = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
     566@COIN_HAS_CLP_TRUE@cbc_LDADD = libCbcSolver.la libCbc.la \
     567@COIN_HAS_CLP_TRUE@     $(CGLOBJDIR)/src/libCgl.la \
    546568@COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    547569@COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/libOsi.la \
     
    693715libCbc.la: $(libCbc_la_OBJECTS) $(libCbc_la_DEPENDENCIES)
    694716        $(CXXLINK) -rpath $(libdir) $(libCbc_la_LDFLAGS) $(libCbc_la_OBJECTS) $(libCbc_la_LIBADD) $(LIBS)
     717libCbcSolver.la: $(libCbcSolver_la_OBJECTS) $(libCbcSolver_la_DEPENDENCIES)
     718        $(CXXLINK) -rpath $(libdir) $(libCbcSolver_la_LDFLAGS) $(libCbcSolver_la_OBJECTS) $(libCbcSolver_la_LIBADD) $(LIBS)
    695719install-binPROGRAMS: $(bin_PROGRAMS)
    696720        @$(NORMAL_INSTALL)
Note: See TracChangeset for help on using the changeset viewer.