Ignore:
Timestamp:
Jan 10, 2011 11:18:44 AM (9 years ago)
Author:
pbelotti
Message:

adopting new build system in trunk

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property Externals deleted
    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.5.30
        2 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.6.4/CoinUtils
        3 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.0.17
        4 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.0.14
        5 ThirdParty/HSL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/releases/1.1.4
        6 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.0.21
        7 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.1.8
        8 Cbc  https://projects.coin-or.org/svn/Cbc/releases/2.4.2/Cbc
        9 Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.55.0/Cgl
        10 Clp  https://projects.coin-or.org/svn/Clp/releases/1.11.1/Clp
        11 Osi  https://projects.coin-or.org/svn/Osi/releases/0.102.3/Osi
        12 Ipopt  https://projects.coin-or.org/svn/Ipopt/releases/3.8.3/Ipopt
        13 Bonmin  https://projects.coin-or.org/svn/Bonmin/releases/1.4.1/Bonmin
         1BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.7
         2CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
         3ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
         4ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
         5ThirdParty/HSL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/stable/1.3
         6ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
         7ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
         8ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
         9Cbc  https://projects.coin-or.org/svn/Cbc/stable/2.7/Cbc
         10Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
         11Clp  https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
         12Osi  https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
         13Ipopt  https://projects.coin-or.org/svn/Ipopt/trunk/Ipopt
         14Bonmin  https://projects.coin-or.org/svn/Bonmin/trunk/Bonmin
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 477-484
  • trunk/Couenne

  • trunk/Couenne/src/main/Makefile.am

    • Property svn:keywords set to Author Date Id Revision
    r394 r487  
    33# This file is distributed under the Common Public License.
    44
    5 ## $Id: Makefile.am 105 2006-11-03 19:31:19Z pbonami $
     5## $Id$
    66
    77# Author: Pietro Belotti, on a template by Pierre Bonami
     
    1111# what is built at this level
    1212
    13 if COIN_HAS_ASL
    14   bin_PROGRAMS = couenne couenne2
    15 endif
    16 
    1713lib_LTLIBRARIES = libBonCouenne.la
    1814
     
    2117        SmartAslDestr.cpp
    2218
    23 COINLIBS = \
    24         $(CBCOBJDIR)/src/libCbc.la \
    25         $(CGLOBJDIR)/src/libCgl.la \
    26         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    27         $(BONMINOBJDIR)/src/CbcBonmin/libbonmin.la \
    28         $(BONMINOBJDIR)/src/Algorithms/Branching/libbonbranching.la \
    29         $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la
    30 
    31 if COIN_HAS_CPX
    32      COINLIBS += $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
     19if COIN_HAS_ASL
     20  bin_PROGRAMS = couenne
     21  #couenne2
    3322endif
    3423
    35 if COIN_HAS_NTY
    36      COINLIBS += $(NTYLIB)
    37 endif
     24couenne_SOURCES = BonCouenne.cpp
     25couenne_LDADD         = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_LIBS)         $(ASL_LIBS)
     26couenne_DEPENDENCIES  = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_DEPENDENCIES) $(ASL_DEPENDENCIES)
    3827
    39 COINLIBS += \
    40      $(OSIOBJDIR)/src/libOsi.la \
    41      $(CLPOBJDIR)/src/libClp.la \
    42      $(COINUTILSOBJDIR)/src/libCoinUtils.la
    43 
    44 IPOPTLIBS = \
    45         $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
    46         $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la
    47 
    48 couenne_LDADD         = libBonCouenne.la
    49 couenne_DEPENDENCIES  = libBonCouenne.la
    50 
    51 if COIN_HAS_ASL
    52 couenne_LDADD        += ../readnl/libCouenneReadnl.la
    53 couenne_DEPENDENCIES += ../readnl/libCouenneReadnl.la
    54 COINLIBS             += \
    55         $(BONMINOBJDIR)/src/Interfaces/Ampl/libbonamplinterface.la \
    56         $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la
    57 endif
    58 
    59 
    60 COINLIBS += \
    61         $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
    62         $(BONMINOBJDIR)/src/Interfaces/libbonmininterfaces.la
    63 
    64 couenne_LDADD        += ../libCouenne.la
    65 couenne_DEPENDENCIES += ../libCouenne.la
    66 
    67 couenne_SOURCES = \
    68         BonCouenne.cpp
    69 
    70 couenne2_LDADD         = libBonCouenne.la
    71 couenne2_DEPENDENCIES  = libBonCouenne.la
    72 
    73 if COIN_HAS_ASL
    74 couenne2_LDADD        += ../readnl/libCouenneReadnl.la
    75 couenne2_DEPENDENCIES += ../readnl/libCouenneReadnl.la
    76 endif
    77 
    78 couenne2_LDADD        += ../libCouenne.la
    79 couenne2_DEPENDENCIES += ../libCouenne.la
    80 
    81 couenne2_SOURCES = \
    82         Couenne.cpp \
    83         CouenneOSInterface.cpp
    84 
    85 #       ../readnl/readnl.cpp
    86 
    87 couenne_LDADD += \
    88         $(LIBCBCCOPY) \
    89         $(COINLIBS) \
    90         $(ADDLIBS) \
    91         $(ASLLIB) \
    92         `cat $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt` \
    93         `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
    94 
    95 couenne2_LDADD += \
    96         $(LIBCBCCOPY) \
    97         $(COINLIBS) \
    98         $(ADDLIBS) \
    99         $(ASLLIB) \
    100         `cat $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt` \
    101         `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
     28#couenne2_SOURCES = Couenne.cpp CouenneOSInterface.cpp
     29#couenne2_LDADD         = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_LIBS)         $(ASL_LIBS)
     30#couenne2_DEPENDENCIES  = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_DEPENDENCIES) $(ASL_DEPENDENCIES)
    10231
    10332# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    10534# libraries.
    10635couenne_LDFLAGS = -rpath $(libdir)
    107 couenne2_LDFLAGS = -rpath $(libdir)
     36#couenne2_LDFLAGS = -rpath $(libdir)
    10837
    10938# Here list all include flags, relative to this "srcdir" directory.  This
    11039# "cygpath" stuff is necessary to compile with native compilers on Windows
    111 AM_CPPFLAGS = \
    112         -I`$(CYGPATH_W) $(BONMINOBJDIR)/inc` \
    113         -I`$(CYGPATH_W) $(BONMINSRCDIR)/src/Algorithms` \
    114         -I`$(CYGPATH_W) $(BONMINSRCDIR)/src/Algorithms/Branching` \
    115         -I`$(CYGPATH_W) $(BONMINSRCDIR)/src/Algorithms/OaGenerators` \
    116         -I`$(CYGPATH_W) $(BONMINSRCDIR)/src/Algorithms/Ampl` \
    117         -I`$(CYGPATH_W) $(BONMINSRCDIR)/src/Interfaces` \
    118         -I`$(CYGPATH_W) $(BONMINSRCDIR)/src/Interfaces/Ipopt` \
    119         -I`$(CYGPATH_W) $(BONMINSRCDIR)/src/Interfaces/Ampl` \
    120         -I`$(CYGPATH_W) $(BONMINSRCDIR)/src/CbcBonmin` \
    121         -I`$(CYGPATH_W) $(IPOPTOBJDIR)/inc` \
    122         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` \
    123         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Interfaces` \
    124         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/LinAlg` \
    125         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Apps/AmplSolver` \
    126         -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    127         -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    128         -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` \
    129         -I`$(CYGPATH_W) $(CBCSRCDIR)/examples` \
    130         -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    131         -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` \
    132         -I`$(CYGPATH_W) $(CLPOBJDIR)/inc` \
    133         -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    134         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    135         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`\
    136         -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
    137         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglMixedIntegerRounding2` \
    138         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglLandP` \
    139         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglRedSplit` \
    140         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglGomory` \
    141         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglProbing` \
    142         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglOddHole` \
    143         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` \
    144         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglFlowCover` \
    145         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglMixedIntegerRounding` \
    146         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglTwomir` \
    147         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglKnapsackCover` \
    148         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglPreProcess` \
    149         -I`$(CYGPATH_W) $(CGLOBJDIR)/inc`
    150 
    151 if COIN_HAS_CPX
    152   AM_CPPFLAGS += \
    153         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx` \
    154         -I`$(CYGPATH_W) $(CPXINCDIR)`
    155 endif
    156 
    157 AM_CPPFLAGS += $(ASL_CPPFLAGS)
    158 
    159 #if COIN_HAS_FILTERSQP
    160 #  AM_CPPFLAGS += -I`$(CYGPATH_W) $(BONMINSRCDIR)/src/Interfaces/Filter`
    161 #endif
    162 
    163 AM_CPPFLAGS += \
    164         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src` \
    165         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/interfaces` \
    166         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/heuristics` \
    167         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/crossconv` \
    168         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/two_implied_bt` \
    169         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/convex` \
    170         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression` \
    171         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression/operators` \
    172         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/bound_tightening` \
    173         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/disjunctive` \
    174         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/main` \
    175         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/problem` \
    176         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/branch` \
    177         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/readnl`
     40AM_CPPFLAGS = $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) \
     41        -I`$(CYGPATH_W) $(srcdir)/..` \
     42        -I`$(CYGPATH_W) $(srcdir)/../convex` \
     43        -I`$(CYGPATH_W) $(srcdir)/../expression` \
     44        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
     45        -I`$(CYGPATH_W) $(srcdir)/../interfaces` \
     46        -I`$(CYGPATH_W) $(srcdir)/../heuristics` \
     47        -I`$(CYGPATH_W) $(srcdir)/../branch`\
     48        -I`$(CYGPATH_W) $(srcdir)/../problem` \
     49        -I`$(CYGPATH_W) $(srcdir)/../crossconv` \
     50        -I`$(CYGPATH_W) $(srcdir)/../two_implied_bt` \
     51        -I`$(CYGPATH_W) $(srcdir)/../bound_tightening` \
     52        -I`$(CYGPATH_W) $(srcdir)/../disjunctive` \
     53        -I`$(CYGPATH_W) $(srcdir)/../readnl`
    17854
    17955# This line is necessary to allow VPATH compilation with MS compilers
    18056# on Cygwin
    18157DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
    182 
    183 
    184 
    185 if COIN_HAS_NTY
    186   AM_CPPFLAGS += \
    187         -I`$(CYGPATH_W) $(NTYINCDIR)`
    188 endif
Note: See TracChangeset for help on using the changeset viewer.