Changeset 2079 for ThirdParty/Blas


Ignore:
Timestamp:
Jan 8, 2011 12:58:26 PM (9 years ago)
Author:
stefan
Message:

drop creating of addlibs file; rerun autotools

Location:
ThirdParty/Blas/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Blas/trunk/Makefile.am

    r2002 r2079  
    5555pkgconfiglib_DATA = coinblas.pc
    5656
    57 if COIN_HAS_PKGCONFIG
    58 addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/Blas
    59        
    60 install-data-hook:
    61         @$(mkdir_p) "$(addlibsdir)"
    62         PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    63         $(PKG_CONFIG) --libs coinblas > $(addlibsdir)/blas_addlibs.txt
    64 
    65 uninstall-hook:
    66         rm -f $(addlibsdir)/blas_addlibs.txt
    67 endif
    68 
    69 test: $(libampl)
     57test:
    7058        @echo "No test available for Blas."
    7159
  • ThirdParty/Blas/trunk/Makefile.in

    r2053 r2079  
    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
Note: See TracChangeset for help on using the changeset viewer.