Ignore:
Timestamp:
Jun 5, 2010 3:42:36 PM (9 years ago)
Author:
stefan
Message:

merge split branch into trunk

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.6
        2 ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        3 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        4 Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
        5 Data/Sample   https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        6 CoinUtils     https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        7 
         1BuildTools    https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         3ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         4#Data/Netlib   https://projects.coin-or.org/svn/Data/trunk/Netlib
         5Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
         6CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 1522,​1527-1531,​1542-1550,​1558
  • trunk/Clp/src

  • trunk/Clp/src/Makefile.am

    r1344 r1559  
    99AUTOMAKE_OPTIONS = foreign
    1010
     11if COIN_HAS_OSI
     12  SUBDIRS = OsiClp
     13endif
     14
    1115########################################################################
    1216#                               libClp                                 #
     
    1519# Name of the library compiled in this directory.  We want it to be installed
    1620# in the 'lib' directory
    17 lib_LTLIBRARIES = libClp.la
     21coinlibdir = ${libdir}/coin
     22coinlib_LTLIBRARIES = libClp.la
    1823
    1924# List all source files for this library, including headers
     
    9297
    9398# List all additionally required COIN libraries
    94 clp_LDADD = libClp.la \
    95         $(COINUTILSOBJDIR)/src/libCoinUtils.la
    96 
    97 # Here we add additional libraries
    98 LIBS += $(ADDLIBS) `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
     99clp_LDADD = libClp.la $(COINUTILS_LIBS) $(ADDLIBS)
    99100
    100101# Finally, the -rpath flag is used by libtool to make sure that the shared
    101102# library is found (in the lib install directory) when we are using dynamic
    102103# libraries.
    103 clp_LDFLAGS = -rpath $(libdir)
     104clp_LDFLAGS = -rpath $(libdir)/coin
    104105
    105106########################################################################
     
    107108########################################################################
    108109
    109 # Here list all include flags, relative to this "srcdir" directory.  This
    110 # "cygpath" stuff is necessary to compile with native compilers on Windows.
    111 AM_CPPFLAGS = \
    112         -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    113         -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc`
     110# CbcOrClpParam seem to require COIN_HAS_CLP so that it knows that it is build within Clp
     111AM_CPPFLAGS = $(COINUTILS_CFLAGS) -DCOIN_HAS_CLP
    114112
    115113# This line is necessary to allow VPATH compilation with MS compilers
     
    169167        Idiot.hpp
    170168
     169# needed by Cbc
     170includecoin_HEADERS += CbcOrClpParam.cpp
     171
    171172#############################################################################
    172173# Create the Config.h file that always defines HAVE_CONFIG_H and install it #
Note: See TracChangeset for help on using the changeset viewer.