Changeset 88


Ignore:
Timestamp:
Apr 1, 2009 2:13:06 PM (11 years ago)
Author:
stefan
Message:

try to fix last commit: link libamplsolver.a into couenne executable only because linking it into a shared library does not always work

Location:
trunk/Couenne/src
Files:
4 edited

Legend:

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

    r87 r88  
    169169libCouenne_la_LIBADD += \
    170170        $(BONMINOBJDIR)/src/CbcBonmin/libbonminampl.la \
    171         $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
    172         $(ASLLIB)
     171        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la
    173172endif
    174173
  • trunk/Couenne/src/Makefile.in

    r87 r88  
    5555@COIN_HAS_ASL_TRUE@am__append_2 = \
    5656@COIN_HAS_ASL_TRUE@        $(BONMINOBJDIR)/src/CbcBonmin/libbonminampl.la \
    57 @COIN_HAS_ASL_TRUE@        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
    58 @COIN_HAS_ASL_TRUE@        $(ASLLIB)
     57@COIN_HAS_ASL_TRUE@        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la
    5958
    6059
     
    8180libLTLIBRARIES_INSTALL = $(INSTALL)
    8281LTLIBRARIES = $(lib_LTLIBRARIES)
    83 am__DEPENDENCIES_1 =
    84 @COIN_HAS_ASL_TRUE@am__DEPENDENCIES_2 = $(BONMINOBJDIR)/src/CbcBonmin/libbonminampl.la \
    85 @COIN_HAS_ASL_TRUE@     $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
    86 @COIN_HAS_ASL_TRUE@     $(am__DEPENDENCIES_1)
    87 libCouenne_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
     82@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_1 = $(BONMINOBJDIR)/src/CbcBonmin/libbonminampl.la \
     83@COIN_HAS_ASL_TRUE@     $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la
     84libCouenne_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
    8885am__libCouenne_la_SOURCES_DIST = main/BonCouenneSetup.cpp \
    8986        main/BonCouenneInterface.cpp main/BonNlpHeuristic.cpp \
  • trunk/Couenne/src/main/Makefile.am

    r87 r88  
    114114        $(LIBCBCCOPY) \
    115115        $(COINLIBS) \
    116         $(ADDLIBS)
     116        $(ADDLIBS) \
     117        $(ASLLIB)
    117118
    118119# Finally, the -rpath flag is used by libtool to make sure that the shared
  • trunk/Couenne/src/main/Makefile.in

    r87 r88  
    9393        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    9494am__DEPENDENCIES_4 =
    95 couenne_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4)
     95couenne_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4) \
     96        $(am__DEPENDENCIES_4)
    9697DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    9798depcomp = $(SHELL) $(top_srcdir)/../depcomp
     
    351352        $(LIBCBCCOPY) \
    352353        $(COINLIBS) \
    353         $(ADDLIBS)
     354        $(ADDLIBS) \
     355        $(ASLLIB)
    354356
    355357
Note: See TracChangeset for help on using the changeset viewer.