Ignore:
Timestamp:
Jun 19, 2011 10:15:54 AM (9 years ago)
Author:
stefan
Message:

sync with trunk rev2307

Location:
ThirdParty/Blas/stable/1.2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Blas/stable/1.2

  • ThirdParty/Blas/stable/1.2/Makefile.in

    r2062 r2308  
    5757        $(top_srcdir)/configure config.guess config.sub depcomp \
    5858        install-sh ltmain.sh missing
    59 @HAVE_EXTERNALS_TRUE@am__append_1 = Externals
    60 @HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
     59@HAVE_EXTERNALS_TRUE@am__append_1 = Dependencies
     60@HAVE_EXTERNALS_TRUE@am__append_2 = .Dependencies-stamp
    6161subdir = .
    6262ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    297297pkgconfiglibdir = $(libdir)/pkgconfig
    298298pkgconfiglib_DATA = coinblas.pc
    299 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/Blas
    300299
    301300########################################################################
     
    629628        @echo "This command is intended for maintainers to use"
    630629        @echo "it deletes files that may require special tools to rebuild."
    631 @COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
    632 @COIN_HAS_PKGCONFIG_FALSE@uninstall-hook:
    633630clean: clean-am
    634631
     
    653650
    654651install-data-am: install-pkgconfiglibDATA
    655         @$(NORMAL_INSTALL)
    656         $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    657652
    658653install-exec-am: install-libLTLIBRARIES
     
    685680uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
    686681        uninstall-pkgconfiglibDATA
    687         @$(NORMAL_INSTALL)
    688         $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
    689682
    690683.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
     
    694687        distclean-libtool distclean-tags distcleancheck distdir \
    695688        distuninstallcheck dvi dvi-am html html-am info info-am \
    696         install install-am install-data install-data-am \
    697         install-data-hook install-exec install-exec-am install-info \
    698         install-info-am install-libLTLIBRARIES install-man \
    699         install-pkgconfiglibDATA install-strip installcheck \
    700         installcheck-am installdirs maintainer-clean \
    701         maintainer-clean-generic mostlyclean mostlyclean-compile \
    702         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    703         tags uninstall uninstall-am uninstall-hook uninstall-info-am \
    704         uninstall-libLTLIBRARIES uninstall-pkgconfiglibDATA
    705 
    706 
    707 @COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
    708 @COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
    709 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    710 @COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs coinblas > $(addlibsdir)/blas_addlibs.txt
    711 
    712 @COIN_HAS_PKGCONFIG_TRUE@uninstall-hook:
    713 @COIN_HAS_PKGCONFIG_TRUE@       rm -f $(addlibsdir)/blas_addlibs.txt
    714 
    715 test: $(libampl)
     689        install install-am install-data install-data-am install-exec \
     690        install-exec-am install-info install-info-am \
     691        install-libLTLIBRARIES install-man install-pkgconfiglibDATA \
     692        install-strip installcheck installcheck-am installdirs \
     693        maintainer-clean maintainer-clean-generic mostlyclean \
     694        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     695        pdf pdf-am ps ps-am tags uninstall uninstall-am \
     696        uninstall-info-am uninstall-libLTLIBRARIES \
     697        uninstall-pkgconfiglibDATA
     698
     699
     700test:
    716701        @echo "No test available for Blas."
    717702
     
    755740@MAINTAINER_MODE_TRUE@  cp $< $@
    756741
    757 # Take care of updating externals (if Externals file exists)
    758 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Externals-stamp
    759 
    760 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Externals-stamp: $(srcdir)/Externals
    761 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn propset svn:externals -F Externals .
    762 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Externals-stamp
    763 
    764 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Externals-stamp
     742# Take care of updating externals (if Dependencies file exists)
     743@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Dependencies-stamp
     744
     745@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Dependencies-stamp: $(srcdir)/Dependencies
     746@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); BuildTools/set_externals Dependencies
     747@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Dependencies-stamp
     748
     749@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Dependencies-stamp
    765750@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn update
    766751
Note: See TracChangeset for help on using the changeset viewer.