Changeset 97


Ignore:
Timestamp:
Apr 6, 2009 10:50:59 AM (13 years ago)
Author:
stefan
Message:

move addlibs to couenne_LDADD because LIBS is also used when libBonCouenne is build (gives problem on windows)

Location:
trunk/Couenne/src/main
Files:
2 edited

Legend:

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

    r96 r97  
    4646        $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la
    4747
    48 LIBS += `cat $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt`
    49 LIBS += `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
    50 
    5148couenne_LDADD        = \
    5249        libBonCouenne.la \
     
    6562        $(COINLIBS) \
    6663        $(ADDLIBS) \
    67         $(ASLLIB)
     64        $(ASLLIB) \
     65        `cat $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt` \
     66        `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
    6867
    6968
  • trunk/Couenne/src/main/Makefile.in

    r96 r97  
    202202LIBEXT = @LIBEXT@
    203203LIBOBJS = @LIBOBJS@
    204 LIBS = @LIBS@ `cat \
    205         $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt` `cat \
    206         $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
     204LIBS = @LIBS@
    207205LIBTOOL = @LIBTOOL@
    208206LIBTOOLM4 = @LIBTOOLM4@
     
    315313couenne_LDADD = libBonCouenne.la ../readnl/libCouenneReadnl.la \
    316314        ../libCouenne.la $(LIBCBCCOPY) $(COINLIBS) $(ADDLIBS) \
    317         $(ASLLIB)
     315        $(ASLLIB) `cat \
     316        $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt` `cat \
     317        $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
    318318couenne_DEPENDENCIES = \
    319319        libBonCouenne.la \
Note: See TracChangeset for help on using the changeset viewer.