Ignore:
Timestamp:
Jan 18, 2015 3:32:41 AM (5 years ago)
Author:
stefan
Message:

merge r3256 from stable/1.4

Location:
ThirdParty/HSL/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/trunk

  • ThirdParty/HSL/trunk/Makefile.in

    r3101 r3335  
    9696libLTLIBRARIES_INSTALL = $(INSTALL)
    9797LTLIBRARIES = $(lib_LTLIBRARIES)
    98 libcoinhsl_la_LIBADD =
     98am__DEPENDENCIES_1 =
     99@BUILD_COINHSL_TRUE@@DEPENDENCY_LINKING_TRUE@libcoinhsl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
     100@BUILD_COINHSL_TRUE@@DEPENDENCY_LINKING_TRUE@   $(am__DEPENDENCIES_1)
    99101am__libcoinhsl_la_SOURCES_DIST = coinhsl/common/deps.f \
    100102        coinhsl/mc19/mc19d.f coinhsl/ma27/ma27d.f coinhsl/ma28/ma28d.f \
     
    219221COIN_HAS_HSL_MC68_FALSE = @COIN_HAS_HSL_MC68_FALSE@
    220222COIN_HAS_HSL_MC68_TRUE = @COIN_HAS_HSL_MC68_TRUE@
     223COIN_HAS_LAPACK_FALSE = @COIN_HAS_LAPACK_FALSE@
     224COIN_HAS_LAPACK_TRUE = @COIN_HAS_LAPACK_TRUE@
    221225COIN_HAS_MA27_FALSE = @COIN_HAS_MA27_FALSE@
    222226COIN_HAS_MA27_TRUE = @COIN_HAS_MA27_TRUE@
     
    279283INSTALL_SCRIPT = @INSTALL_SCRIPT@
    280284INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
     285LAPACK_CFLAGS = @LAPACK_CFLAGS@
     286LAPACK_CFLAGS_INSTALLED = @LAPACK_CFLAGS_INSTALLED@
     287LAPACK_DATA = @LAPACK_DATA@
     288LAPACK_DATA_INSTALLED = @LAPACK_DATA_INSTALLED@
     289LAPACK_DEPENDENCIES = @LAPACK_DEPENDENCIES@
     290LAPACK_LIBS = @LAPACK_LIBS@
     291LAPACK_LIBS_INSTALLED = @LAPACK_LIBS_INSTALLED@
    281292LDFLAGS = @LDFLAGS@
    282293LIBEXT = @LIBEXT@
     
    390401@BUILD_COINHSL_TRUE@    $(am__append_8) $(am__append_10) \
    391402@BUILD_COINHSL_TRUE@    $(am__append_12) $(am__append_14)
     403@BUILD_COINHSL_TRUE@@DEPENDENCY_LINKING_TRUE@libcoinhsl_la_LIBADD = $(HSL_LIBS) $(HSL_PCLIBS)
    392404@BUILD_COINHSL_TRUE@libcoinhsl_la_LDFLAGS = $(LT_LDFLAGS)
    393405
Note: See TracChangeset for help on using the changeset viewer.