From d8de1ea511380d592bfea11515fd176f37f2b817 Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 24 Aug 2007 22:44:27 +0000 Subject: [PATCH] Use PETSc convenience library also on OS X after all when we are using static libs. Don't use it only with shared libs. git-svn-id: https://svn.dealii.org/trunk@15042 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/common/Make.global_options.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index 2fcf003f23..60ad870d0e 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -117,7 +117,7 @@ lib-deal2-3d.g = $(LIBDIR)/libdeal_II_3d.g$(lib-suffix) # # also sort of annoying is the fact that on Mac OS X, the trick with the # one library doesn't appear to work. Instead of a single library, we therefore -# have to list all of them. +# have to list all of them, at least if we are using shared libs. ifeq ($(DEAL_II_PETSC_VERSION_MINOR),2) lib-contrib-petsc-path.g = $(DEAL_II_PETSC_DIR)/lib/libg_c++/$(DEAL_II_PETSC_ARCH) lib-contrib-petsc-path.o = $(DEAL_II_PETSC_DIR)/lib/libO_c++/$(DEAL_II_PETSC_ARCH) @@ -129,8 +129,13 @@ ifeq ($(findstring darwin,$(TARGET)),) lib-contrib-petsc.g = $(LIBDIR)/libpetscall.g$(lib-suffix) lib-contrib-petsc.o = $(LIBDIR)/libpetscall$(lib-suffix) else - lib-contrib-petsc.g = $(shell echo $(DEAL_II_PETSC_DIR)/lib/$(DEAL_II_PETSC_ARCH)/*$(lib-suffix)) - lib-contrib-petsc.o = $(shell echo $(DEAL_II_PETSC_DIR)/lib/$(DEAL_II_PETSC_ARCH)/*$(lib-suffix)) + ifeq ($(enable-shared),yes) + lib-contrib-petsc.g = $(shell echo $(DEAL_II_PETSC_DIR)/lib/$(DEAL_II_PETSC_ARCH)/*$(lib-suffix)) + lib-contrib-petsc.o = $(shell echo $(DEAL_II_PETSC_DIR)/lib/$(DEAL_II_PETSC_ARCH)/*$(lib-suffix)) + else + lib-contrib-petsc.g = $(LIBDIR)/libpetscall.g$(lib-suffix) + lib-contrib-petsc.o = $(LIBDIR)/libpetscall$(lib-suffix) + endif endif -- 2.39.5