Changeset 2002 for ThirdParty/Blas/trunk

Timestamp:

Dec 26, 2010 10:56:13 AM (10 years ago)

Author:

stefan

Message:

change library installation directory to libdir; rerun autotools

Location:

ThirdParty/Blas/trunk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (8 diffs)
• coinblas.pc.in (modified) (1 diff)
• configure (modified) (3 diffs)

ThirdParty/Blas/trunk/Makefile.am

@@ -9 +9 @@
 EXTRA_DIST = get.blas INSTALL.BLAS
 
-thirdpartylibdir = $(libdir)/coin/ThirdParty
-thirdpartylib_LTLIBRARIES = libcoinblas.la
+lib_LTLIBRARIES = libcoinblas.la
 
 libcoinblas_la_SOURCES = \

ThirdParty/Blas/trunk/Makefile.in

@@ -75 +75 @@
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(thirdpartylibdir)" \
-        "$(DESTDIR)$(pkgconfiglibdir)"
-thirdpartylibLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(thirdpartylib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
 libcoinblas_la_LIBADD =
 am_libcoinblas_la_OBJECTS = dasum.lo daxpy.lo dcopy.lo ddot.lo \
@@ -258 +257 @@
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = get.blas INSTALL.BLAS $(am__append_1)
-thirdpartylibdir = $(libdir)/coin/ThirdParty
-thirdpartylib_LTLIBRARIES = libcoinblas.la
+lib_LTLIBRARIES = libcoinblas.la
 libcoinblas_la_SOURCES = \
         dasum.f \
@@ -354 +352 @@
 coinblas-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinblas-uninstalled.pc.in
         cd $(top_builddir) && $(SHELL) ./config.status $@
-install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
         @$(NORMAL_INSTALL)
-        test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
-        @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
+        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
           if test -f $$p; then \
             f=$(am__strip_dir) \
-            echo " $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
-            $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
+            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
           else :; fi; \
         done
 
-uninstall-thirdpartylibLTLIBRARIES:
+uninstall-libLTLIBRARIES:
         @$(NORMAL_UNINSTALL)
-        @set -x; list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
+        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
           p=$(am__strip_dir) \
-          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(thirdpartylibdir)/$$p'"; \
-          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(thirdpartylibdir)/$$p"; \
-        done
-
-clean-thirdpartylibLTLIBRARIES:
-        -test -z "$(thirdpartylib_LTLIBRARIES)" || rm -f $(thirdpartylib_LTLIBRARIES)
-        @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
+          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+        done
+
+clean-libLTLIBRARIES:
+        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
           test "$$dir" != "$$p" || dir=.; \
@@ -382 +380 @@
         done
 libcoinblas.la: $(libcoinblas_la_OBJECTS) $(libcoinblas_la_DEPENDENCIES) 
-        $(F77LINK) -rpath $(thirdpartylibdir) $(libcoinblas_la_LDFLAGS) $(libcoinblas_la_OBJECTS) $(libcoinblas_la_LIBADD) $(LIBS)
+        $(F77LINK) -rpath $(libdir) $(libcoinblas_la_LDFLAGS) $(libcoinblas_la_OBJECTS) $(libcoinblas_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -605 +603 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
-        for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \
+        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \
           test -z "$$dir" || $(mkdir_p) "$$dir"; \
         done
@@ -638 +636 @@
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
         mostlyclean-am
 
@@ -657 +655 @@
 info-am:
 
-install-data-am: install-pkgconfiglibDATA \
-        install-thirdpartylibLTLIBRARIES
+install-data-am: install-pkgconfiglibDATA
         @$(NORMAL_INSTALL)
         $(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
-install-exec-am:
+install-exec-am: install-libLTLIBRARIES
 
 install-info: install-info-am
@@ -689 +686 @@
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pkgconfiglibDATA \
-        uninstall-thirdpartylibLTLIBRARIES
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
+        uninstall-pkgconfiglibDATA
         @$(NORMAL_INSTALL)
         $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-        clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
-        ctags dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
-        dist-zip distcheck distclean distclean-compile \
-        distclean-generic distclean-libtool distclean-tags \
-        distcleancheck distdir distuninstallcheck dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-data-hook install-exec install-exec-am \
-        install-info install-info-am install-man \
-        install-pkgconfiglibDATA install-strip \
-        install-thirdpartylibLTLIBRARIES installcheck installcheck-am \
-        installdirs maintainer-clean maintainer-clean-generic \
-        mostlyclean mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-        uninstall-am uninstall-hook uninstall-info-am \
-        uninstall-pkgconfiglibDATA uninstall-thirdpartylibLTLIBRARIES
+        clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
+        dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
+        distcheck distclean distclean-compile distclean-generic \
+        distclean-libtool distclean-tags distcleancheck distdir \
+        distuninstallcheck dvi dvi-am html html-am info info-am \
+        install install-am install-data install-data-am \
+        install-data-hook install-exec install-exec-am install-info \
+        install-info-am install-libLTLIBRARIES install-man \
+        install-pkgconfiglibDATA install-strip installcheck \
+        installcheck-am installdirs maintainer-clean \
+        maintainer-clean-generic mostlyclean mostlyclean-compile \
+        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+        tags uninstall uninstall-am uninstall-hook uninstall-info-am \
+        uninstall-libLTLIBRARIES uninstall-pkgconfiglibDATA
 
 

ThirdParty/Blas/trunk/coinblas.pc.in

@@ -1 +1 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@/coin/ThirdParty
+libdir=@libdir@
 
 Name: Blas

ThirdParty/Blas/trunk/configure

@@ -6027 +6027 @@
 full_prefix=`cd $full_prefix ; pwd`
 
-abs_lib_dir=$full_prefix/lib/coin
+abs_lib_dir=$full_prefix/lib
 
 abs_include_dir=$full_prefix/include
@@ -21509 +21509 @@
       if test "$GXX" = "yes"; then
         RPATH_FLAGS=
-        for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
+        for dir in $abs_lib_dir; do
           RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
         done
@@ -21526 +21526 @@
     *-*-solaris*)
         RPATH_FLAGS=
-        for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
+        for dir in $abs_lib_dir; do
           RPATH_FLAGS="$RPATH_FLAGS -R$dir"
         done