Changeset 92


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

use relative path to bonmin objdir because of windows/cygwin

Location:
trunk/Couenne/src
Files:
2 edited

Legend:

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

    r90 r92  
    168168# adding AMPL interface for use with other executables
    169169libCouenne_la_LIBADD += \
    170         $(BONMINOBJDIR)/src/Interfaces/Ampl/BonAmplInterface.lo \
    171         $(BONMINOBJDIR)/src/Interfaces/Ampl/BonAmplTMINLP.lo \
    172         $(BONMINOBJDIR)/src/Interfaces/Ampl/sos_kludge.lo \
    173         $(BONMINOBJDIR)/src/Algorithms/Ampl/BonAmplSetup.lo \
     170        ../../Bonmin/src/Interfaces/Ampl/BonAmplInterface.lo \
     171        ../../Bonmin/src/Interfaces/Ampl/BonAmplTMINLP.lo \
     172        ../../Bonmin/src/Interfaces/Ampl/sos_kludge.lo \
     173        ../../Bonmin/src/Algorithms/Ampl/BonAmplSetup.lo \
    174174        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la
    175175endif
  • trunk/Couenne/src/Makefile.in

    r90 r92  
    5454# adding AMPL interface for use with other executables
    5555@COIN_HAS_ASL_TRUE@am__append_2 = \
    56 @COIN_HAS_ASL_TRUE@     $(BONMINOBJDIR)/src/Interfaces/Ampl/BonAmplInterface.lo \
    57 @COIN_HAS_ASL_TRUE@     $(BONMINOBJDIR)/src/Interfaces/Ampl/BonAmplTMINLP.lo \
    58 @COIN_HAS_ASL_TRUE@     $(BONMINOBJDIR)/src/Interfaces/Ampl/sos_kludge.lo \
    59 @COIN_HAS_ASL_TRUE@     $(BONMINOBJDIR)/src/Algorithms/Ampl/BonAmplSetup.lo \
     56@COIN_HAS_ASL_TRUE@     ../../Bonmin/src/Interfaces/Ampl/BonAmplInterface.lo \
     57@COIN_HAS_ASL_TRUE@     ../../Bonmin/src/Interfaces/Ampl/BonAmplTMINLP.lo \
     58@COIN_HAS_ASL_TRUE@     ../../Bonmin/src/Interfaces/Ampl/sos_kludge.lo \
     59@COIN_HAS_ASL_TRUE@     ../../Bonmin/src/Algorithms/Ampl/BonAmplSetup.lo \
    6060@COIN_HAS_ASL_TRUE@        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la
    6161
     
    8383libLTLIBRARIES_INSTALL = $(INSTALL)
    8484LTLIBRARIES = $(lib_LTLIBRARIES)
    85 @COIN_HAS_ASL_TRUE@am__DEPENDENCIES_1 = $(BONMINOBJDIR)/src/Interfaces/Ampl/BonAmplInterface.lo \
    86 @COIN_HAS_ASL_TRUE@     $(BONMINOBJDIR)/src/Interfaces/Ampl/BonAmplTMINLP.lo \
    87 @COIN_HAS_ASL_TRUE@     $(BONMINOBJDIR)/src/Interfaces/Ampl/sos_kludge.lo \
    88 @COIN_HAS_ASL_TRUE@     $(BONMINOBJDIR)/src/Algorithms/Ampl/BonAmplSetup.lo \
     85@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_1 = ../../Bonmin/src/Interfaces/Ampl/BonAmplInterface.lo \
     86@COIN_HAS_ASL_TRUE@     ../../Bonmin/src/Interfaces/Ampl/BonAmplTMINLP.lo \
     87@COIN_HAS_ASL_TRUE@     ../../Bonmin/src/Interfaces/Ampl/sos_kludge.lo \
     88@COIN_HAS_ASL_TRUE@     ../../Bonmin/src/Algorithms/Ampl/BonAmplSetup.lo \
    8989@COIN_HAS_ASL_TRUE@     $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la
    9090libCouenne_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
Note: See TracChangeset for help on using the changeset viewer.