From f14b60d7fbebbe1fa1f7d9e5a35247300a041c77 Mon Sep 17 00:00:00 2001 From: rschulz Date: Sat, 2 Jul 2005 09:16:57 +0000 Subject: [PATCH] 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 --- deal.II/doc/news/changes.html | 7 +++++++ deal.II/lac/Makefile | 32 ++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/deal.II/doc/news/changes.html b/deal.II/doc/news/changes.html index 2b053a1aa2..a871441e4b 100644 --- a/deal.II/doc/news/changes.html +++ b/deal.II/doc/news/changes.html @@ -128,6 +128,13 @@ inconvenience this causes.

General

    +
  1. + Changed: Under Cygwin, linking against LAPACK and UMFPACK did + not work. This is now fixed in the Makefiles. Changes only + affect Cygwin. +
    + (Ralf B. Schulz, 2005/07/02) +

  2. New: The latest version of UMFPACK, version 4.4, has been imported.
    diff --git a/deal.II/lac/Makefile b/deal.II/lac/Makefile index 9bfb4e8030..3a4ddbedbf 100644 --- 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 = -- 2.39.5