From 576fe66041527848f29a4a96ec37774a9aebeda6 Mon Sep 17 00:00:00 2001 From: hartmann Date: Wed, 28 Apr 2004 13:39:22 +0000 Subject: [PATCH] Unify notation: use suffix .so and .a for optimized and .g.so and .g.a for debug mode. Apply this rule also to libpetsc. git-svn-id: https://svn.dealii.org/trunk@9111 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/common/Make.global_options.in | 2 +- deal.II/lib/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index a67ef5f6f5..5ddfe7a477 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -112,7 +112,7 @@ lib-contrib-hsl = $(LIBDIR)/libhsl$(lib-suffix) 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) lib-contrib-petsc.g = $(LIBDIR)/libpetsc.g$(lib-suffix) -lib-contrib-petsc.o = $(LIBDIR)/libpetsc.o$(lib-suffix) +lib-contrib-petsc.o = $(LIBDIR)/libpetsc$(lib-suffix) # same for metis, except that there is only one library in that case lib-contrib-metis = $(DEAL_II_METIS_DIR)/libmetis.a diff --git a/deal.II/lib/Makefile b/deal.II/lib/Makefile index a6e11c0fb1..c6988bb109 100644 --- a/deal.II/lib/Makefile +++ b/deal.II/lib/Makefile @@ -60,8 +60,8 @@ endif @echo "======================debug============= Linking library: libpetsc.g.so" @$(CXX) -shared -o libpetsc.g.so \ -Wl,-rpath,$(lib-contrib-petsc-path.g) $(xlib.g) - @echo "======================optimized========= Linking library: libpetsc.o.so" - @$(CXX) -shared -o libpetsc.o.so \ + @echo "======================optimized========= Linking library: libpetsc.so" + @$(CXX) -shared -o libpetsc.so \ -Wl,-rpath,$(lib-contrib-petsc-path.o) $(xlib.o) else -- 2.39.5