From: wolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Thu, 31 Jan 2002 13:46:10 +0000 (+0000)
Subject: Place HSL libraries in the global lib dir.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bab81c764c8665d889ab2d35992f95918bb6145;p=dealii-svn.git

Place HSL libraries in the global lib dir.


git-svn-id: https://svn.dealii.org/trunk@5438 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in
index 0feb3c7e2e..f7ea380a34 100644
--- a/deal.II/common/Make.global_options.in
+++ b/deal.II/common/Make.global_options.in
@@ -47,8 +47,6 @@ endif
 
 # path for libraries 
 
-lib-path-contrib-hsl = $D/contrib/hsl/lib
-
 LIBPATH    += $(addprefix -L,$(libdir))
 
 
@@ -57,15 +55,6 @@ LIBPATH    += $(addprefix -L,$(libdir))
 vpath %.a $(libdir)
 vpath %.so $(libdir)
 
-# if HSL sublibs are used, add them to the path
-ifeq ($(USE_CONTRIB_HSL),yes)
-  LIBPATH += $(addprefix -L,$(lib-path-contrib-hsl))
-  vpath %.a $(lib-path-contrib-hsl)
-  vpath %.so $(lib-path-contrib-hsl)
-endif
-
-
-
 
 
 lib-suffix = @lib_suffix@
@@ -84,7 +73,7 @@ lib-deal2-1d.g = $(LIBDIR)/libdeal_II_1d.g$(lib-suffix)
 lib-deal2-2d.g = $(LIBDIR)/libdeal_II_2d.g$(lib-suffix)
 lib-deal2-3d.g = $(LIBDIR)/libdeal_II_3d.g$(lib-suffix)
 
-lib-contrib-hsl = $(lib-path-contrib-hsl)/libhsl$(lib-suffix)
+lib-contrib-hsl = $(LIBDIR)/libhsl$(lib-suffix)
 
 # if HSL is used, always link it in conjunction with liblac
 ifeq ($(USE_CONTRIB_HSL),yes)
diff --git a/deal.II/doc/development/Makefile b/deal.II/doc/development/Makefile
index 2f87fa6df8..ea6944d8c1 100644
--- a/deal.II/doc/development/Makefile
+++ b/deal.II/doc/development/Makefile
@@ -23,7 +23,6 @@ makefiles.html: Makefile makefiles.1.html $D/common/Make.global_options makefile
 	@echo '<li><code>lib-path-base=$(lib-path-base)</code>' >> $@
 	@echo '<li><code>lib-path-lac=$(lib-path-lac)</code>' >> $@
 	@echo '<li><code>lib-path-deal2=$(lib-path-deal2)</code>' >> $@
-	@echo '<li><code>lib-path-contrib-hsl=$(lib-path-contrib-hsl)</code>' >> $@
 	@echo '<li><code>LIBPATH=$(LIBPATH)</code>' >> $@
 	@echo '<li><code>LIBS=$(LIBS)</code>' >> $@
 	@echo '<li><code>lib-base.o=$(lib-base.o)</code>' >> $@
diff --git a/deal.II/doc/development/makefiles.1.html b/deal.II/doc/development/makefiles.1.html
index 9ddbf190b3..65f055dde8 100644
--- a/deal.II/doc/development/makefiles.1.html
+++ b/deal.II/doc/development/makefiles.1.html
@@ -167,19 +167,6 @@
       </dd>
 
 
-      <dt> <code>lib-path-contrib-hsl</code> </dt>
-      <dd> <p>
-           Path to the place where the HSL subroutine functions are
-           linked into a library. Note that this library is only
-           available if it is installed explicitely by the user.
-	   (See the
-	   <a href="../readme.html#external-libs" target="body">ReadMe</a>
-	   file for more information on installation of HSL
-           subroutines.)
-           </p>
-      </dd>
-
-
       <dt> <code>LIBPATH</code> </dt>
       <dd> <p>
            All the library pathes prefixed by -L, i.e. the