]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Place HSL libraries in the global lib dir.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 31 Jan 2002 13:46:10 +0000 (13:46 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 31 Jan 2002 13:46:10 +0000 (13:46 +0000)
git-svn-id: https://svn.dealii.org/trunk@5438 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/common/Make.global_options.in
deal.II/doc/development/Makefile
deal.II/doc/development/makefiles.1.html

index 0feb3c7e2e0db118868a43861df240452f3f5eb5..f7ea380a34b15722a3fa2f46e6276edd830c39bc 100644 (file)
@@ -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)
index 2f87fa6df827bf7314dfa2619e83c502e5ccf73f..ea6944d8c196a5df351eea07c1feb2a8ef82b1a2 100644 (file)
@@ -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>' >> $@
index 9ddbf190b3d8fcc9e6b278d077ad17194f9f22d9..65f055dde85d185d912a650c76477e8c42f34842 100644 (file)
       </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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.