Use the full set of dependent libs.

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

diff --git a/deal.II/deal.II/Makefile b/deal.II/deal.II/Makefile
index ef3c0a0af0fac0d4d81a908f770d96c8326926be..e2cac63facccc204764e53f977da6206336fcb86 100644 (file)
--- a/deal.II/deal.II/Makefile
+++ b/deal.II/deal.II/Makefile
@@ -81,6 +81,32 @@ $(LIBDIR)/3d/%.$(OBJEXT) :
 ifneq ($(GXX-VERSION),compaq_cxx)
   deplibs.g = $(lib-lac.g) $(lib-base.g)
   deplibs.o = $(lib-lac.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 METIS
+  ifeq ($(USE_CONTRIB_METIS),yes)
+    deplibs.g += $(lib-contrib-metis)
+    deplibs.o += $(lib-contrib-metis)
+  endif
+
+  # for cygwin and darwin, also llapack and such are necessary
+  # we better link all libraries mentioned in $(LIBS)
+  ifneq ($(findstring cygwin,$(TARGET))$(findstring darwin,$(TARGET)),)
+    deplibs.g += $(LIBS)
+    deplibs.o += $(LIBS)
+  endif
+
 else
   deplibs.g =
   deplibs.o =