Ignore:
Timestamp:
Dec 16, 2013 11:30:10 AM (6 years ago)
Author:
tkr
Message:

Merging r1996 from trunk

Location:
stable/1.15/Clp
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • stable/1.15/Clp

  • stable/1.15/Clp/src

  • stable/1.15/Clp/src/OsiClp

  • stable/1.15/Clp/src/OsiClp/Makefile.am

    r1781 r2010  
    1919libOsiClp_la_SOURCES = OsiClpSolverInterface.cpp OsiClpSolverInterface.hpp
    2020
     21# List all additionally required libraries
     22if DEPENDENCY_LINKING
     23libOsiClp_la_LIBADD = $(OSICLPLIB_LIBS) ../libClp.la
     24endif
     25
    2126# This is for libtool (on Windows)
    2227libOsiClp_la_LDFLAGS = $(LT_LDFLAGS)
  • stable/1.15/Clp/src/OsiClp/Makefile.in

    r2009 r2010  
    6565libLTLIBRARIES_INSTALL = $(INSTALL)
    6666LTLIBRARIES = $(lib_LTLIBRARIES)
    67 libOsiClp_la_LIBADD =
     67am__DEPENDENCIES_1 =
     68@DEPENDENCY_LINKING_TRUE@libOsiClp_la_DEPENDENCIES =  \
     69@DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1) ../libClp.la
    6870am_libOsiClp_la_OBJECTS = OsiClpSolverInterface.lo
    6971libOsiClp_la_OBJECTS = $(am_libOsiClp_la_OBJECTS)
     
    359361libOsiClp_la_SOURCES = OsiClpSolverInterface.cpp OsiClpSolverInterface.hpp
    360362
     363# List all additionally required libraries
     364@DEPENDENCY_LINKING_TRUE@libOsiClp_la_LIBADD = $(OSICLPLIB_LIBS) ../libClp.la
     365
    361366# This is for libtool (on Windows)
    362367libOsiClp_la_LDFLAGS = $(LT_LDFLAGS)
Note: See TracChangeset for help on using the changeset viewer.