From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Mon, 16 Feb 2009 05:37:37 +0000 (+0000)
Subject: Move the dependence on Trilinos into the base libs (from the lac libs) since we refer... 
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51a80274c17c6253b925ea9516f2f0b984ee32cc;p=dealii-svn.git

Move the dependence on Trilinos into the base libs (from the lac libs) since we reference some Trilinos symbols from libbase.so. (This came to the fore because the detached_ma27 program only links against libbase.so, not liblac.so.)

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

diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in
index 174f6514f7..a1a8c67831 100644
--- a/deal.II/common/Make.global_options.in
+++ b/deal.II/common/Make.global_options.in
@@ -206,19 +206,19 @@ endif
 
 
 # set paths to all the libraries we need:
-lib-base.o     = $(LIBDIR)/libbase$(lib-suffix)
-lib-base.g     = $(LIBDIR)/libbase.g$(lib-suffix)
+lib-base.o     = $(LIBDIR)/libbase$(lib-suffix) \
+		 $(lib-contrib-trilinos)
+lib-base.g     = $(LIBDIR)/libbase.g$(lib-suffix) \
+		 $(lib-contrib-trilinos)
 
 lib-lac.o      = $(LIBDIR)/liblac$(lib-suffix) \
 		 $(lib-hsl) \
 		 $(lib-contrib-petsc.o) $(lib-contrib-slepc) $(DEAL_II_PETSC_MPIUNI_LIB) \
-		 $(lib-contrib-metis) \
-		 $(lib-contrib-trilinos)
+		 $(lib-contrib-metis)
 lib-lac.g      = $(LIBDIR)/liblac.g$(lib-suffix) \
 		 $(lib-hsl) \
 		 $(lib-contrib-petsc.g) $(lib-contrib-slepc) $(DEAL_II_PETSC_MPIUNI_LIB) \
-		 $(lib-contrib-metis) \
-		 $(lib-contrib-trilinos)
+		 $(lib-contrib-metis)
 
 lib-deal2-1d.o = $(LIBDIR)/libdeal_II_1d$(lib-suffix)
 lib-deal2-2d.o = $(LIBDIR)/libdeal_II_2d$(lib-suffix)