Move the dependence on Trilinos into the base libs (from the lac libs) since we refer...

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 174f6514f7a4c6b55860d07c4d10052d7154232d..a1a8c67831d064a2ac466e90b4527d62829e1da3 100644 (file)
--- 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)