Ignore:
Timestamp:
Apr 30, 2010 11:02:15 AM (10 years ago)
Author:
stefan
Message:

rerun autotools; generate addlibs files from .pc files; remove empty README's

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/branches/split/Makefile.in

    r1481 r1539  
    5959
    6060@COIN_HAS_MA77_TRUE@am__append_5 = hsl_ma77d.f90 hsl_ma77d.deps90.f90 hsl_ma77d.deps77.f
    61 DIST_COMMON = README $(am__configure_deps) \
     61DIST_COMMON = $(am__configure_deps) \
    6262        $(srcdir)/../../BuildTools/Makemain.inc $(srcdir)/Makefile.am \
    6363        $(srcdir)/Makefile.in $(srcdir)/coinhsl-uninstalled.pc.in \
    64         $(srcdir)/coinhsl.pc.in $(srcdir)/hsl_addlibs.txt.in \
    65         $(top_srcdir)/configure config.guess config.sub depcomp \
    66         install-sh ltmain.sh missing
     64        $(srcdir)/coinhsl.pc.in $(top_srcdir)/configure config.guess \
     65        config.sub depcomp install-sh ltmain.sh missing
    6766@HAVE_EXTERNALS_TRUE@am__append_6 = Externals
    6867@HAVE_EXTERNALS_TRUE@am__append_7 = .Externals-stamp
     
    7675 configure.lineno configure.status.lineno
    7776mkinstalldirs = $(install_sh) -d
    78 CONFIG_CLEAN_FILES = hsl_addlibs.txt coinhsl.pc coinhsl-uninstalled.pc
     77CONFIG_CLEAN_FILES = coinhsl.pc coinhsl-uninstalled.pc
    7978am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    8079am__vpath_adj = case $$p in \
     
    172171COIN_HAS_MC19_FALSE = @COIN_HAS_MC19_FALSE@
    173172COIN_HAS_MC19_TRUE = @COIN_HAS_MC19_TRUE@
     173COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
     174COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
    174175CPP = @CPP@
    175176CPPFLAGS = @CPPFLAGS@
     
    238239PACKAGE_VERSION = @PACKAGE_VERSION@
    239240PATH_SEPARATOR = @PATH_SEPARATOR@
     241PKG_CONFIG = @PKG_CONFIG@
    240242RANLIB = @RANLIB@
    241243RPATH_FLAGS = @RPATH_FLAGS@
     
    258260ac_ct_STRIP = @ac_ct_STRIP@
    259261ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
     262ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    260263am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    261264am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
     
    306309        $(am__append_3) $(am__append_4) $(am__append_5)
    307310libcoinhsl_la_LDFLAGS = $(LT_LDFLAGS)
    308 @EXTRA_SHARED_COMMAND_TRUE@CLEANFILES = $(HSL_SHARED_LIB) $(DEFFILE)
    309 addlibsdir = $(datadir)/coin/doc/ThirdParty/HSL
    310 addlibs_DATA = hsl_addlibs.txt README
     311@COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(datadir)/coin/doc/ThirdParty/HSL
     312@COIN_HAS_PKGCONFIG_TRUE@addlibs_DATA = hsl_addlibs.txt
    311313pkgconfiglibdir = $(libdir)/pkgconfig
    312314pkgconfiglib_DATA = coinhsl.pc
     
    319321#                         Maintainer Stuff                             #
    320322########################################################################
     323CLEANFILES = $(HSL_SHARED_LIB) $(DEFFILE) hsl_addlibs.txt
    321324
    322325# Files that are generated and should be cleaned with make distclean
     
    361364$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    362365        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
    363 hsl_addlibs.txt: $(top_builddir)/config.status $(srcdir)/hsl_addlibs.txt.in
    364         cd $(top_builddir) && $(SHELL) ./config.status $@
    365366coinhsl.pc: $(top_builddir)/config.status $(srcdir)/coinhsl.pc.in
    366367        cd $(top_builddir) && $(SHELL) ./config.status $@
     
    809810@EXTRA_SHARED_COMMAND_TRUE@     rm -f "$(DESTDIR)$(libdir)/coin/ThirdParty/$(HSL_SHARED_LIB)"
    810811
     812@COIN_HAS_PKGCONFIG_TRUE@hsl_addlibs.txt : coinhsl.pc
     813@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:$(libdir)/pkgconfig:${PKG_CONFIG_PATH} $(PKG_CONFIG) --libs coinhsl > hsl_addlibs.txt
     814
    811815install-doc: $(DocFiles)
    812816        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
Note: See TracChangeset for help on using the changeset viewer.