]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
List the Trilinos libraries we use only once.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 21 Oct 2008 04:04:57 +0000 (04:04 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 21 Oct 2008 04:04:57 +0000 (04:04 +0000)
git-svn-id: https://svn.dealii.org/trunk@17283 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/common/Make.global_options.in

index 07df0dc01b2cd52c9d84acd37bde6b6a14295bf1..b71ee39a5d1c0e0a7ee71bbfdc7fd2d7522cca54 100644 (file)
@@ -215,47 +215,34 @@ endif
 ifeq ($(USE_CONTRIB_TRILINOS),yes)
   INCLUDE += -I$(include-path-trilinos)
 
+  DEAL_II_TRILINOS_LIBS = amesos \
+                aztecoo \
+               belos \
+               epetra \
+               epetraext \
+               ifpack \
+               ml \
+               rtop \
+               sacado \
+               stratimikos \
+               stratimikosamesos \
+               stratimikosaztecoo \
+               stratimikosifpack \
+               stratimikosml \
+               teuchos \
+               thyra \
+               thyraepetra \
+               thyraepetraext \
+               triutils 
+
   ifeq ($(enable-shared),yes)
-    lib-contrib-trilinos = -lamesos \
-                -laztecoo \
-               -lbelos \
-               -lepetra \
-               -lepetraext \
-               -lifpack \
-               -lml \
-               -lrtop \
-               -lsacado \
-               -lstratimikos \
-               -lstratimikosamesos \
-               -lstratimikosaztecoo \
-               -lstratimikosifpack \
-               -lstratimikosml \
-               -lteuchos \
-               -lthyra \
-               -lthyraepetra \
-               -lthyraepetraext \
-               -ltriutils  
+    lib-contrib-trilinos = \
+       $(addsuffix $(shared-lib-suffix), $(addprefix $(DEAL_II_TRILINOS_LIBDIR)/lib, \
+                                                     $(DEAL_II_TRILINOS_LIBS)))
   else
-    lib-contrib-trilinos =  \
-               $(DEAL_II_TRILINOS_LIBDIR)/libamesos.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/libaztecoo.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/libbelos.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/libepetra.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/libepetraext.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/libifpack.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/libml.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/librtop.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/libsacado.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/libstratimikos.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/libstratimikosamesos.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/libstratimikosaztecoo.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/libstratimikosifpack.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/libstratimikosml.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/libteuchos.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/libthyra.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/libthyraepetra.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/libthyraepetraext.a \
-               $(DEAL_II_TRILINOS_LIBDIR)/libtriutils.a
+    lib-contrib-trilinos = \
+       $(addsuffix $(static-lib-suffix), $(addprefix $(DEAL_II_TRILINOS_LIBDIR)/lib, \
+                                                     $(DEAL_II_TRILINOS_LIBS)))
   endif
 
   LDFLAGS += $(lib-contrib-trilinos)

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.