Changeset 2002 for ThirdParty/Blas


Ignore:
Timestamp:
Dec 26, 2010 10:56:13 AM (9 years ago)
Author:
stefan
Message:

change library installation directory to libdir; rerun autotools

Location:
ThirdParty/Blas/trunk
Files:
4 edited

Legend:

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

    r1952 r2002  
    99EXTRA_DIST = get.blas INSTALL.BLAS
    1010
    11 thirdpartylibdir = $(libdir)/coin/ThirdParty
    12 thirdpartylib_LTLIBRARIES = libcoinblas.la
     11lib_LTLIBRARIES = libcoinblas.la
    1312
    1413libcoinblas_la_SOURCES = \
  • ThirdParty/Blas/trunk/Makefile.in

    r1952 r2002  
    7575  esac;
    7676am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    77 am__installdirs = "$(DESTDIR)$(thirdpartylibdir)" \
    78         "$(DESTDIR)$(pkgconfiglibdir)"
    79 thirdpartylibLTLIBRARIES_INSTALL = $(INSTALL)
    80 LTLIBRARIES = $(thirdpartylib_LTLIBRARIES)
     77am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)"
     78libLTLIBRARIES_INSTALL = $(INSTALL)
     79LTLIBRARIES = $(lib_LTLIBRARIES)
    8180libcoinblas_la_LIBADD =
    8281am_libcoinblas_la_OBJECTS = dasum.lo daxpy.lo dcopy.lo ddot.lo \
     
    258257AUTOMAKE_OPTIONS = foreign
    259258EXTRA_DIST = get.blas INSTALL.BLAS $(am__append_1)
    260 thirdpartylibdir = $(libdir)/coin/ThirdParty
    261 thirdpartylib_LTLIBRARIES = libcoinblas.la
     259lib_LTLIBRARIES = libcoinblas.la
    262260libcoinblas_la_SOURCES = \
    263261        dasum.f \
     
    354352coinblas-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinblas-uninstalled.pc.in
    355353        cd $(top_builddir) && $(SHELL) ./config.status $@
    356 install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
     354install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    357355        @$(NORMAL_INSTALL)
    358         test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
    359         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     356        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     357        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    360358          if test -f $$p; then \
    361359            f=$(am__strip_dir) \
    362             echo " $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
    363             $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
     360            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
     361            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
    364362          else :; fi; \
    365363        done
    366364
    367 uninstall-thirdpartylibLTLIBRARIES:
     365uninstall-libLTLIBRARIES:
    368366        @$(NORMAL_UNINSTALL)
    369         @set -x; list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     367        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    370368          p=$(am__strip_dir) \
    371           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(thirdpartylibdir)/$$p'"; \
    372           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(thirdpartylibdir)/$$p"; \
    373         done
    374 
    375 clean-thirdpartylibLTLIBRARIES:
    376         -test -z "$(thirdpartylib_LTLIBRARIES)" || rm -f $(thirdpartylib_LTLIBRARIES)
    377         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     369          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
     370          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
     371        done
     372
     373clean-libLTLIBRARIES:
     374        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
     375        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    378376          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    379377          test "$$dir" != "$$p" || dir=.; \
     
    382380        done
    383381libcoinblas.la: $(libcoinblas_la_OBJECTS) $(libcoinblas_la_DEPENDENCIES)
    384         $(F77LINK) -rpath $(thirdpartylibdir) $(libcoinblas_la_LDFLAGS) $(libcoinblas_la_OBJECTS) $(libcoinblas_la_LIBADD) $(LIBS)
     382        $(F77LINK) -rpath $(libdir) $(libcoinblas_la_LDFLAGS) $(libcoinblas_la_OBJECTS) $(libcoinblas_la_LIBADD) $(LIBS)
    385383
    386384mostlyclean-compile:
     
    605603all-am: Makefile $(LTLIBRARIES) $(DATA)
    606604installdirs:
    607         for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \
     605        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \
    608606          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    609607        done
     
    638636clean: clean-am
    639637
    640 clean-am: clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
     638clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
    641639        mostlyclean-am
    642640
     
    657655info-am:
    658656
    659 install-data-am: install-pkgconfiglibDATA \
    660         install-thirdpartylibLTLIBRARIES
     657install-data-am: install-pkgconfiglibDATA
    661658        @$(NORMAL_INSTALL)
    662659        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    663660
    664 install-exec-am:
     661install-exec-am: install-libLTLIBRARIES
    665662
    666663install-info: install-info-am
     
    689686ps-am:
    690687
    691 uninstall-am: uninstall-info-am uninstall-pkgconfiglibDATA \
    692         uninstall-thirdpartylibLTLIBRARIES
     688uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
     689        uninstall-pkgconfiglibDATA
    693690        @$(NORMAL_INSTALL)
    694691        $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
    695692
    696693.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
    697         clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
    698         ctags dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
    699         dist-zip distcheck distclean distclean-compile \
    700         distclean-generic distclean-libtool distclean-tags \
    701         distcleancheck distdir distuninstallcheck dvi dvi-am html \
    702         html-am info info-am install install-am install-data \
    703         install-data-am install-data-hook install-exec install-exec-am \
    704         install-info install-info-am install-man \
    705         install-pkgconfiglibDATA install-strip \
    706         install-thirdpartylibLTLIBRARIES installcheck installcheck-am \
    707         installdirs maintainer-clean maintainer-clean-generic \
    708         mostlyclean mostlyclean-compile mostlyclean-generic \
    709         mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    710         uninstall-am uninstall-hook uninstall-info-am \
    711         uninstall-pkgconfiglibDATA uninstall-thirdpartylibLTLIBRARIES
     694        clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
     695        dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
     696        distcheck distclean distclean-compile distclean-generic \
     697        distclean-libtool distclean-tags distcleancheck distdir \
     698        distuninstallcheck dvi dvi-am html html-am info info-am \
     699        install install-am install-data install-data-am \
     700        install-data-hook install-exec install-exec-am install-info \
     701        install-info-am install-libLTLIBRARIES install-man \
     702        install-pkgconfiglibDATA install-strip installcheck \
     703        installcheck-am installdirs maintainer-clean \
     704        maintainer-clean-generic mostlyclean mostlyclean-compile \
     705        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     706        tags uninstall uninstall-am uninstall-hook uninstall-info-am \
     707        uninstall-libLTLIBRARIES uninstall-pkgconfiglibDATA
    712708
    713709
  • ThirdParty/Blas/trunk/coinblas.pc.in

    r1822 r2002  
    11prefix=@prefix@
    22exec_prefix=@exec_prefix@
    3 libdir=@libdir@/coin/ThirdParty
     3libdir=@libdir@
    44
    55Name: Blas
  • ThirdParty/Blas/trunk/configure

    r1952 r2002  
    60276027full_prefix=`cd $full_prefix ; pwd`
    60286028
    6029 abs_lib_dir=$full_prefix/lib/coin
     6029abs_lib_dir=$full_prefix/lib
    60306030
    60316031abs_include_dir=$full_prefix/include
     
    2150921509      if test "$GXX" = "yes"; then
    2151021510        RPATH_FLAGS=
    21511         for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
     21511        for dir in $abs_lib_dir; do
    2151221512          RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    2151321513        done
     
    2152621526    *-*-solaris*)
    2152721527        RPATH_FLAGS=
    21528         for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
     21528        for dir in $abs_lib_dir; do
    2152921529          RPATH_FLAGS="$RPATH_FLAGS -R$dir"
    2153021530        done
Note: See TracChangeset for help on using the changeset viewer.