Ignore:
Timestamp:
Apr 6, 2009 6:00:52 AM (11 years ago)
Author:
stefan
Message:

resolve some circular dependencies by moving more into libCouenneExpression; separate libCouenneReadnl from libCouenne; put BonCouenne? into libCouenne; install only libCouenne, libBonCouenne, and libCouenneReadnl; debug build still broken because CouenneProblem? depends on readnl and vice versa

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/main/Makefile.am

    r94 r96  
    1414  bin_PROGRAMS = couenne
    1515endif
     16
     17lib_LTLIBRARIES = libBonCouenne.la
     18
     19libBonCouenne_la_SOURCES = \
     20        BonCouenneSetup.cpp \
     21        BonCouenneInterface.cpp \
     22        BonNlpHeuristic.cpp \
     23        BonCouenneInfo.cpp \
     24        BonInitHeuristic.cpp
    1625
    1726COINLIBS = \
     
    4049LIBS += `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
    4150
    42 #if COIN_HAS_COUENNE
    43 #  COINLIBS += $(COUENNEOBJDIR)/src/libCouenne.la
     51couenne_LDADD        = \
     52        libBonCouenne.la \
     53        ../readnl/libCouenneReadnl.la \
     54        ../libCouenne.la
    4455
    45 couenne_LDADD = ../libCouenne.la
     56couenne_DEPENDENCIES = \
     57        libBonCouenne.la \
     58        ../readnl/libCouenneReadnl.la \
     59        ../libCouenne.la
    4660
    47 #couenne_LDADD = \
    48 #       ../util/libCouenneUtil.la \
    49 #       ../readnl/libCouenneReadnl.la \
    50 #       ../expression/libCouenneExpression.la \
    51 #       ../branch/libCouenneBranch.la \
    52 #       ../convex/libCouenneConvex.la \
    53 #       ../standardize/libCouenneStandardize.la \
    54 #       ../disjunctive/libCouenneDisjunctive.la \
    55 #       ../bound_tightening/libCouenneBoundTightening.la \
    56 #       ../problem/libCouenneProblem.la
    57 
    58 couenne_SOURCES = \
    59         BonCouenne.cpp \
    60         BonCouenneSetup.cpp \
    61         BonCouenneInterface.cpp \
    62         BonNlpHeuristic.cpp \
    63         BonCouenneInfo.cpp \
    64         BonInitHeuristic.cpp
    65 
    66 #couenne_LDADD += \
    67 #       ../util/libCouenneUtil.la \
    68 #       ../branch/libCouenneBranch.la \
    69 #       ../expression/libCouenneExpression.la \
    70 #       ../convex/libCouenneConvex.la \
    71 #       ../problem/libCouenneProblem.la \
    72 #       ../libCouenne.la
     61couenne_SOURCES = BonCouenne.cpp
    7362
    7463couenne_LDADD += \
     
    8372# libraries.
    8473couenne_LDFLAGS = -rpath $(libdir)
    85 
    86 #       ../util/libCouenneUtil.la \
    87 #       ../branch/libCouenneBranch.la \
    88 #       ../convex/libCouenneConvex.la \
    89 #       ../expression/libCouenneExpression.la \
    90 #       ../problem/libCouenneProblem.la
    91 
    92 #if COIN_HAS_ASL
    93 #COINLIBS +=
    94 #couenne_LDADD += \
    95 #       ../readnl/libCouenneReadnl.la
    96 #endif
    97 
    98 #COINLIBS +=
    99 #couenne_LDADD += \
    100 #       ../standardize/libCouenneStandardize.la \
    101 #       ../bound_tightening/libCouenneBoundTightening.la \
    102 #       ../disjunctive/libCouenneDisjunctive.la
    103 #endif
    104 
    10574
    10675# Here list all include flags, relative to this "srcdir" directory.  This
Note: See TracChangeset for help on using the changeset viewer.