Changeset 94


Ignore:
Timestamp:
Apr 5, 2009 5:58:03 PM (13 years ago)
Author:
stefan
Message:

try to reorder libraries to resolve dependencies... but fail (still broken with debug)

Location:
trunk/Couenne/src
Files:
4 edited

Legend:

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

    r93 r94  
    2020
    2121libCouenne_la_LIBADD = \
    22         ./util/libCouenneUtil.la \
    23         ./branch/libCouenneBranch.la \
    24         ./expression/libCouenneExpression.la \
    25         ./convex/libCouenneConvex.la \
    2622        ./problem/libCouenneProblem.la \
    2723        ./readnl/libCouenneReadnl.la \
     24        ./expression/libCouenneExpression.la \
     25        ./branch/libCouenneBranch.la \
     26        ./convex/libCouenneConvex.la \
     27        ./util/libCouenneUtil.la \
    2828        ./standardize/libCouenneStandardize.la \
    2929        ./bound_tightening/libCouenneBoundTightening.la \
  • trunk/Couenne/src/Makefile.in

    r93 r94  
    280280libCouenne_la_SOURCES =
    281281libCouenne_la_LIBADD = \
    282         ./util/libCouenneUtil.la \
    283         ./branch/libCouenneBranch.la \
    284         ./expression/libCouenneExpression.la \
    285         ./convex/libCouenneConvex.la \
    286282        ./problem/libCouenneProblem.la \
    287283        ./readnl/libCouenneReadnl.la \
     284        ./expression/libCouenneExpression.la \
     285        ./branch/libCouenneBranch.la \
     286        ./convex/libCouenneConvex.la \
     287        ./util/libCouenneUtil.la \
    288288        ./standardize/libCouenneStandardize.la \
    289289        ./bound_tightening/libCouenneBoundTightening.la \
  • trunk/Couenne/src/main/Makefile.am

    r93 r94  
    4343#  COINLIBS += $(COUENNEOBJDIR)/src/libCouenne.la
    4444
    45 couenne_LDADD = \
    46         ../util/libCouenneUtil.la \
    47         ../branch/libCouenneBranch.la \
    48         ../expression/libCouenneExpression.la \
    49         ../convex/libCouenneConvex.la \
    50         ../standardize/libCouenneStandardize.la \
    51         ../disjunctive/libCouenneDisjunctive.la \
    52         ../bound_tightening/libCouenneBoundTightening.la \
    53         ../readnl/libCouenneReadnl.la \
    54         ../problem/libCouenneProblem.la
     45couenne_LDADD = ../libCouenne.la
     46
     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
    5557
    5658couenne_SOURCES = \
     
    6264        BonInitHeuristic.cpp
    6365
    64 couenne_LDADD += \
    65         ../util/libCouenneUtil.la \
    66         ../branch/libCouenneBranch.la \
    67         ../expression/libCouenneExpression.la \
    68         ../convex/libCouenneConvex.la \
    69         ../problem/libCouenneProblem.la \
    70         ../libCouenne.la
     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
    7173
    7274couenne_LDADD += \
  • trunk/Couenne/src/main/Makefile.in

    r93 r94  
    7878        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    7979am__DEPENDENCIES_3 =
    80 couenne_DEPENDENCIES = ../util/libCouenneUtil.la \
    81         ../branch/libCouenneBranch.la \
    82         ../expression/libCouenneExpression.la \
    83         ../convex/libCouenneConvex.la \
    84         ../standardize/libCouenneStandardize.la \
    85         ../disjunctive/libCouenneDisjunctive.la \
    86         ../bound_tightening/libCouenneBoundTightening.la \
    87         ../readnl/libCouenneReadnl.la ../problem/libCouenneProblem.la \
    88         ../util/libCouenneUtil.la ../branch/libCouenneBranch.la \
    89         ../expression/libCouenneExpression.la \
    90         ../convex/libCouenneConvex.la ../problem/libCouenneProblem.la \
    91         ../libCouenne.la $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
    92         $(am__DEPENDENCIES_3)
     80couenne_DEPENDENCIES = ../libCouenne.la $(am__DEPENDENCIES_2) \
     81        $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3)
    9382depcomp = $(SHELL) $(top_srcdir)/../depcomp
    9483am__depfiles_maybe = depfiles
     
    309298#if COIN_HAS_COUENNE
    310299#  COINLIBS += $(COUENNEOBJDIR)/src/libCouenne.la
    311 couenne_LDADD = ../util/libCouenneUtil.la \
    312         ../branch/libCouenneBranch.la \
    313         ../expression/libCouenneExpression.la \
    314         ../convex/libCouenneConvex.la \
    315         ../standardize/libCouenneStandardize.la \
    316         ../disjunctive/libCouenneDisjunctive.la \
    317         ../bound_tightening/libCouenneBoundTightening.la \
    318         ../readnl/libCouenneReadnl.la ../problem/libCouenneProblem.la \
    319         ../util/libCouenneUtil.la ../branch/libCouenneBranch.la \
    320         ../expression/libCouenneExpression.la \
    321         ../convex/libCouenneConvex.la ../problem/libCouenneProblem.la \
    322         ../libCouenne.la $(LIBCBCCOPY) $(COINLIBS) $(ADDLIBS) \
     300
     301#couenne_LDADD += \
     302#       ../util/libCouenneUtil.la \
     303#       ../branch/libCouenneBranch.la \
     304#       ../expression/libCouenneExpression.la \
     305#       ../convex/libCouenneConvex.la \
     306#       ../problem/libCouenneProblem.la \
     307#       ../libCouenne.la
     308couenne_LDADD = ../libCouenne.la $(LIBCBCCOPY) $(COINLIBS) $(ADDLIBS) \
    323309        $(ASLLIB)
     310
     311#couenne_LDADD = \
     312#       ../util/libCouenneUtil.la \
     313#       ../readnl/libCouenneReadnl.la \
     314#       ../expression/libCouenneExpression.la \
     315#       ../branch/libCouenneBranch.la \
     316#       ../convex/libCouenneConvex.la \
     317#       ../standardize/libCouenneStandardize.la \
     318#       ../disjunctive/libCouenneDisjunctive.la \
     319#       ../bound_tightening/libCouenneBoundTightening.la \
     320#       ../problem/libCouenneProblem.la
    324321couenne_SOURCES = \
    325322        BonCouenne.cpp \
Note: See TracChangeset for help on using the changeset viewer.