Changeset 735


Ignore:
Timestamp:
Aug 9, 2007 9:27:17 PM (12 years ago)
Author:
lou
Message:

Correct linking of cbc-generic when ASL is present.

Location:
branches/BSP/trunk/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/BSP/trunk/Cbc/src/Makefile.am

    r710 r735  
    220220endif
    221221
     222if COIN_HAS_ASL
     223  cbc_generic_LDADD += $(ASLLIB)
     224  AM_CPPFLAGS += $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
     225endif
     226
    222227# Finally the Osi Coin library (many of the above need it)
    223228cbc_generic_LDADD += $(OSIOBJDIR)/src/libOsi.la \
  • branches/BSP/trunk/Cbc/src/Makefile.in

    r710 r735  
    133133
    134134@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__append_32 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
     135@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_33 = $(ASLLIB)
     136@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_34 = $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
    135137subdir = src
    136138DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     
    219221@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@ $(VOLOBJDIR)/src/libVol.la
    220222@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_13 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
     223@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1)
    221224@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_DEPENDENCIES = libCbc.la \
    222225@CBC_BUILD_CBC_GENERIC_TRUE@    $(CGLOBJDIR)/src/libCgl.la \
     
    232235@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_12) \
    233236@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_13) \
     237@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_14) \
    234238@CBC_BUILD_CBC_GENERIC_TRUE@    $(OSIOBJDIR)/src/libOsi.la \
    235239@CBC_BUILD_CBC_GENERIC_TRUE@    $(COINUTILSOBJDIR)/src/libCoinUtils.la
     
    513517        $(am__append_17) $(am__append_19) $(am__append_21) \
    514518        $(am__append_23) $(am__append_25) $(am__append_28) \
    515         $(am__append_31) -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
    516         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` -I`$(CYGPATH_W) \
    517         $(CGLSRCDIR)/src/CglDuplicateRow` -I`$(CYGPATH_W) \
    518         $(CGLSRCDIR)/src/CglFlowCover` -I`$(CYGPATH_W) \
     519        $(am__append_31) $(am__append_34) -I`$(CYGPATH_W) \
     520        $(CGLSRCDIR)/src` -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` \
     521        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglDuplicateRow` \
     522        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglFlowCover` -I`$(CYGPATH_W) \
    519523        $(CGLSRCDIR)/src/CglGomory` -I`$(CYGPATH_W) \
    520524        $(CGLSRCDIR)/src/CglKnapsackCover` -I`$(CYGPATH_W) \
     
    573577@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_22) $(am__append_24) \
    574578@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_26) $(am__append_29) \
    575 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_32) \
     579@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_32) $(am__append_33) \
    576580@CBC_BUILD_CBC_GENERIC_TRUE@    $(OSIOBJDIR)/src/libOsi.la \
    577581@CBC_BUILD_CBC_GENERIC_TRUE@    $(COINUTILSOBJDIR)/src/libCoinUtils.la
Note: See TracChangeset for help on using the changeset viewer.