Ignore:
Timestamp:
Jan 28, 2007 6:39:16 PM (13 years ago)
Author:
andreasw
Message:

do no longer include Cbc_ampl.cpp in libCbc, it is only required executable. Otherwise, anything that uses libCbc will also need AMPL; e.g., the Bonmin test crashes at the moment

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/Makefile.am

    r502 r526  
    4747        CbcLinked.cpp CbcLinked.hpp \
    4848        CbcTreeLocal.cpp CbcTreeLocal.hpp
    49 # If we have the Ampl solver library, we need to add additional things
    50 # also see lower down
    51 if COIN_HAS_ASL
    52 libCbc_la_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    53 endif
     49## If we have the Ampl solver library, we need to add additional things
     50## also see lower down
     51#if COIN_HAS_ASL
     52#libCbc_la_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
     53#endif
    5454
    5555# This is for libtool (on Windows)
     
    164164cbc_generic_LDFLAGS = -rpath $(libdir)
    165165
    166 # If we have the Ampl solver library, we need to add additional things
    167 if COIN_HAS_ASL
    168 cbc_generic_LDADD += $(ASLLIB)
    169 endif
     166## If we have the Ampl solver library, we need to add additional things
     167#if COIN_HAS_ASL
     168#cbc_generic_LDADD += $(ASLLIB)
     169#endif
    170170
    171171########################################################################
     
    200200# If we have the Ampl solver library, we need to add additional things
    201201if COIN_HAS_ASL
     202cbc_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    202203cbc_LDADD += $(ASLLIB)
    203204AM_CPPFLAGS += $(ASL_CPPFLAGS)
Note: See TracChangeset for help on using the changeset viewer.