From: Wolfgang Bangerth Date: Tue, 4 Mar 2008 21:08:20 +0000 (+0000) Subject: Link with Trilinos libs when necessary. X-Git-Tag: v8.0.0~9322 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37ce4fabe4c090cf27a10cd4c4c8dbe5fc7f7673;p=dealii.git Link with Trilinos libs when necessary. git-svn-id: https://svn.dealii.org/trunk@15848 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index 8a882dbb27..941acb199c 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -199,6 +199,15 @@ endif ifeq ($(USE_CONTRIB_TRILINOS),yes) INCLUDE += -I$(include-path-trilinos) + + ifeq ($(enable-shared),yes) + lib-contrib-trilinos = $(shell echo $(DEAL_II_TRILINOS_DIR)/lib/*$(shared-lib-suffix)) + else + lib-contrib-trilinos = $(shell echo $(DEAL_II_TRILINOS_DIR)/lib/*$(static-lib-suffix)) + endif + + lib-lac.g += $(lib-contrib-trilinos) + lib-lac.o += $(lib-contrib-trilinos) endif ifeq ($(USE_CONTRIB_METIS),yes)