Unify notation: use suffix .so and .a for optimized and .g.so and .g.a for debug...

git-svn-id: https://svn.dealii.org/trunk@9111 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in
index a67ef5f6f51664b31d8b3ad2f90b132fd34d79a0..5ddfe7a47731a5985a7780265083f5dcbe47a45e 100644 (file)
--- 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 a6e11c0fb16cdf3f3d093d6e6962d474cfdf6c3c..c6988bb1090deab845292ee4eb87009f7e850a95 100644 (file)
--- 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