From: hartmann Date: Wed, 5 Jul 2006 08:55:39 +0000 (+0000) Subject: Rename deal.II/lib/libpetsc* to libpetscall* to avoid clash with lib/linux-gnu/libpet... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb8a4e0060e6c502a81d565cfeb38803062a7a0f;p=dealii-svn.git Rename deal.II/lib/libpetsc* to libpetscall* to avoid clash with lib/linux-gnu/libpetsc* in the PETSC installation. git-svn-id: https://svn.dealii.org/trunk@13335 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index 93a9d82007..8eada2967f 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -122,8 +122,8 @@ else lib-contrib-petsc-path.g = $(DEAL_II_PETSC_DIR)/lib/$(DEAL_II_PETSC_ARCH) lib-contrib-petsc-path.o = $(DEAL_II_PETSC_DIR)/lib/$(DEAL_II_PETSC_ARCH) endif -lib-contrib-petsc.g = $(LIBDIR)/libpetsc.g$(lib-suffix) -lib-contrib-petsc.o = $(LIBDIR)/libpetsc$(lib-suffix) +lib-contrib-petsc.g = $(LIBDIR)/libpetscall.g$(lib-suffix) +lib-contrib-petsc.o = $(LIBDIR)/libpetscall$(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 ff2bd75368..81277d07f6 100644 --- a/deal.II/lib/Makefile +++ b/deal.II/lib/Makefile @@ -57,50 +57,50 @@ endif ifeq ($(enable-shared),yes) - external-links-petsc: libpetsc.g$(shared-lib-suffix) libpetsc$(shared-lib-suffix) + external-links-petsc: libpetscall.g$(shared-lib-suffix) libpetscall$(shared-lib-suffix) - libpetsc.g$(shared-lib-suffix): $(xlib.g) - @echo "======================debug============= Linking library: libpetsc.g$(shared-lib-suffix)" - @$(CXX) -shared -o libpetsc.g$(shared-lib-suffix) \ + libpetscall.g$(shared-lib-suffix): $(xlib.g) + @echo "======================debug============= Linking library: libpetscall.g$(shared-lib-suffix)" + @$(CXX) -shared -o libpetscall.g$(shared-lib-suffix) \ -Wl,-rpath,$(lib-contrib-petsc-path.g) $(xlib.g) - libpetsc$(shared-lib-suffix): $(xlib.o) - @echo "======================optimized========= Linking library: libpetsc$(shared-lib-suffix)" - @$(CXX) -shared -o libpetsc$(shared-lib-suffix) \ + libpetscall$(shared-lib-suffix): $(xlib.o) + @echo "======================optimized========= Linking library: libpetscall$(shared-lib-suffix)" + @$(CXX) -shared -o libpetscall$(shared-lib-suffix) \ -Wl,-rpath,$(lib-contrib-petsc-path.o) $(xlib.o) else - external-links-petsc: libpetsc.g$(static-lib-suffix) libpetsc$(static-lib-suffix) + external-links-petsc: libpetscall.g$(static-lib-suffix) libpetscall$(static-lib-suffix) # As I don't know how to merge archives, here's a workaround: Extract each of # the archives and append the object files to the libpetsc archive. Do the # same for debug and optimized mode. - libpetsc.g$(static-lib-suffix): $(xlib.g) - @echo "======================debug============= Linking library: libpetsc.g$(static-lib-suffix)" + libpetscall.g$(static-lib-suffix): $(xlib.g) + @echo "======================debug============= Linking library: libpetscall.g$(static-lib-suffix)" @rm -rf .ar_tmp @mkdir .ar_tmp; cd .ar_tmp; \ for arfile in $(xlib.g) ; do \ $(AR) x $$arfile; \ - $(AR) q ../libpetsc.g$(static-lib-suffix) *; \ + $(AR) q ../libpetscall.g$(static-lib-suffix) *; \ rm *; \ done @cd .. @rm -r .ar_tmp - @$(RANLIB) libpetsc.g$(static-lib-suffix) + @$(RANLIB) libpetscall.g$(static-lib-suffix) - libpetsc$(static-lib-suffix): $(xlib.o) - @echo "======================optimized========= Linking library: libpetsc$(static-lib-suffix)" + libpetscall$(static-lib-suffix): $(xlib.o) + @echo "======================optimized========= Linking library: libpetscall$(static-lib-suffix)" @rm -rf .ar_tmp @mkdir .ar_tmp; cd .ar_tmp; \ for arfile in $(xlib.o) ; do \ $(AR) x $$arfile; \ - $(AR) q ../libpetsc$(static-lib-suffix) *; \ + $(AR) q ../libpetscall$(static-lib-suffix) *; \ rm *; \ done @cd .. @rm -r .ar_tmp - @$(RANLIB) libpetsc$(static-lib-suffix) + @$(RANLIB) libpetscall$(static-lib-suffix) endif