changed makefiles to enable compiling with lapack and umfpack on cygwin systems.

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

diff --git a/deal.II/contrib/umfpack/Makefile b/deal.II/contrib/umfpack/Makefile
index 2f3d6cdd9009d8cdb662b00e8d27abed4656bcf9..b8661a0dfc119d258236064349588b093d133cbb 100644 (file)
--- a/deal.II/contrib/umfpack/Makefile
+++ b/deal.II/contrib/umfpack/Makefile
@@ -1,5 +1,13 @@
 include ../../common/Make.global_options
 
+deplibs = 
+
+# for cygwin, llapack and other libraries are necessary to link with
+ifeq ($(findstring cygwin,$(TARGET)),cygwin)
+  deplibs = $(LIBS)
+endif
+
+
 # rules
 lib: $(LIBDIR)/liblac_umfpack$(lib-suffix)
 
@@ -20,7 +28,7 @@ UMFPACK:
 
 $(LIBDIR)/liblac_umfpack$(shared-lib-suffix): AMD UMFPACK
        @echo "=====umfpack==========optimized==$(MT)== Linking library:   $(@F)"
-       @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $D/lib/contrib/umfpack/*.o
+       @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $D/lib/contrib/umfpack/*.o $(deplibs)
 
 
 $(LIBDIR)/liblac_umfpack$(static-lib-suffix): AMD UMFPACK

diff --git a/deal.II/doc/news/changes.html b/deal.II/doc/news/changes.html
index 2b053a1aa28ffdba5860eebda80ae2cdb7c5f37b..a871441e4b7a9fd4386ffe59004b8d4e16ec21b0 100644 (file)
--- a/deal.II/doc/news/changes.html
+++ b/deal.II/doc/news/changes.html
@@ -128,6 +128,13 @@ inconvenience this causes.
 <h3>General</h3>
 
 <ol>
+  <li> <p>
+       Changed: Under Cygwin, linking against LAPACK and UMFPACK did
+       not work. This is now fixed in the Makefiles. Changes only
+       affect Cygwin.
+       <br>
+       (Ralf B. Schulz, 2005/07/02)
+       </p>
   <li> <p>
        New: The latest version of UMFPACK, version 4.4, has been imported.
        <br>

diff --git a/deal.II/lac/Makefile b/deal.II/lac/Makefile
index 9bfb4e80309abcca8157a2f90b70d9482c337dfa..3a4ddbedbfe3491896305e037d515651b431b2e9 100644 (file)
--- a/deal.II/lac/Makefile
+++ b/deal.II/lac/Makefile
@@ -37,27 +37,39 @@ lib: $(LIBDIR)/liblac.g$(lib-suffix) $(LIBDIR)/liblac$(lib-suffix)
 libg: $(LIBDIR)/liblac.g$(lib-suffix)
 libo: $(LIBDIR)/liblac$(lib-suffix)
 
-# if we use HSL, then we need to link against libhsl.so. if we don't, then
-# don't set this variable
-ifeq ($(USE_CONTRIB_HSL),yes)
-  LIBHSL=$(lib-contrib-hsl)
-else
-  LIBHSL=
-endif
-
 # in general, when linking shared libraries, we will want to link with
 # the underlying libs as well. AIX even requires this. on the other
 # hand, on DEC OSF with CXX this will fail with duplicate symbols, so
 # make sure that it doesn't happen on that system and that compiler
 ifneq ($(GXX-VERSION),compaq_cxx)
-  deplibs.g = $(lib-base.g) $(LIBHSL)
-  deplibs.o = $(lib-base.o) $(LIBHSL)
+  deplibs.g = $(lib-base.g)
+  deplibs.o = $(lib-base.o)
+
+  # if we use HSL, then we need to link against libhsl.so.
+  ifeq ($(USE_CONTRIB_HSL),yes)
+    deplibs.g += $(lib-contrib-hsl)
+    deplibs.o += $(lib-contrib-hsl)
+  endif
 
+  # same with PETSC
   ifeq ($(USE_CONTRIB_PETSC),yes)
     deplibs.g += $(lib-contrib-petsc.g)
     deplibs.o += $(lib-contrib-petsc.o)
   endif
 
+  # and UMFPACK
+  ifeq ($(USE_CONTRIB_UMFPACK),yes)
+    deplibs.g += $(LIBDIR)/liblac_umfpack$(lib-suffix)
+    deplibs.o += $(LIBDIR)/liblac_umfpack$(lib-suffix)
+  endif
+
+  # for cygwin, also llapack and such are necessary
+  # we better link all libraries mentioned in $(libs)
+  ifeq ($(findstring cygwin,$(TARGET)),cygwin)
+    deplibs.g += $(LIBS)
+    deplibs.o += $(LIBS)
+  endif
+
 else
   deplibs.g =
   deplibs.o =