Changeset 499 for branches/devel/Cbc/src


Ignore:
Timestamp:
Dec 7, 2006 6:05:47 PM (13 years ago)
Author:
andreasw
Message:

added ASL library also for linking of cbc-generic

Location:
branches/devel/Cbc/src
Files:
2 edited

Legend:

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

    r496 r499  
    163163cbc_generic_LDFLAGS = -rpath $(libdir)
    164164
     165# If we have the Ampl solver library, we need to add additional things
     166if COIN_HAS_ASL
     167cbc_generic_LDADD += $(ASLLIB)
     168endif
     169
    165170########################################################################
    166171#                            cbc program                               #
  • branches/devel/Cbc/src/Makefile.in

    r496 r499  
    109109@COIN_HAS_XPR_TRUE@am__append_27 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    110110
     111# If we have the Ampl solver library, we need to add additional things
     112@COIN_HAS_ASL_TRUE@am__append_28 = $(ASLLIB)
     113
    111114########################################################################
    112115#                            cbc program                               #
     
    115118# Name of the executable compiled in this directory.  We want it to be
    116119# installed in the 'bin' directory
    117 @COIN_HAS_CLP_TRUE@am__append_28 = cbc
     120@COIN_HAS_CLP_TRUE@am__append_29 = cbc
    118121
    119122# If we have the Ampl solver library, we need to add additional things
    120 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_29 = $(ASLLIB)
    121 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_30 = $(ASL_CPPFLAGS)
     123@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_30 = $(ASLLIB)
     124@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_31 = $(ASL_CPPFLAGS)
    122125subdir = src
    123126DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     
    218221@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_13 =  \
    219222@COIN_HAS_XPR_TRUE@     $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
     223@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1)
    220224cbc_generic_DEPENDENCIES = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    221225        $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la $(am__DEPENDENCIES_3) \
     
    226230        $(am__DEPENDENCIES_12) $(am__DEPENDENCIES_13) \
    227231        $(OSIOBJDIR)/src/libOsi.la \
    228         $(COINUTILSOBJDIR)/src/libCoinUtils.la
     232        $(COINUTILSOBJDIR)/src/libCoinUtils.la $(am__DEPENDENCIES_14)
    229233depcomp = $(SHELL) $(top_srcdir)/../depcomp
    230234am__depfiles_maybe = depfiles
     
    497501        $(am__append_19) $(am__append_21) $(am__append_24) \
    498502        $(am__append_27) $(OSIOBJDIR)/src/libOsi.la \
    499         $(COINUTILSOBJDIR)/src/libCoinUtils.la
     503        $(COINUTILSOBJDIR)/src/libCoinUtils.la $(am__append_28)
    500504
    501505########################################################################
     
    513517        $(am__append_12) $(am__append_14) $(am__append_16) \
    514518        $(am__append_18) $(am__append_20) $(am__append_23) \
    515         $(am__append_26) $(am__append_30) -I`$(CYGPATH_W) \
     519        $(am__append_26) $(am__append_31) -I`$(CYGPATH_W) \
    516520        $(CGLSRCDIR)/src` -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` \
    517521        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglDuplicateRow` \
     
    550554@COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la \
    551555@COIN_HAS_CLP_TRUE@     $(COINUTILSOBJDIR)/src/libCoinUtils.la \
    552 @COIN_HAS_CLP_TRUE@     $(am__append_29)
     556@COIN_HAS_CLP_TRUE@     $(am__append_30)
    553557
    554558# Finally, the -rpath flag is used by libtool to make sure that the shared
Note: See TracChangeset for help on using the changeset viewer.