From 8206ca2c4584d241b1115341f24cb400ba809ceb Mon Sep 17 00:00:00 2001 From: kanschat Date: Fri, 17 Aug 2012 12:21:51 +0000 Subject: [PATCH] avoid that library functions are replaced instead of creating a brand new library git-svn-id: https://svn.dealii.org/trunk@26004 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/deal.II/source/Makefile b/deal.II/source/Makefile index 937036e0b7..649dd724e8 100644 --- a/deal.II/source/Makefile +++ b/deal.II/source/Makefile @@ -154,11 +154,13 @@ endif # rules for static libraries $(LIBDIR)/libdeal_II.g$(static-lib-suffix): $(go-files) $(extra-g.o-files) @echo "=====deal.II==========debug======$(MT)== Linking library: $(@F)" - @$(AR) ru $@ $(go-files) $(extra-g.o-files) + @rm $@ + @$(AR) r $@ $(go-files) $(extra-g.o-files) @$(RANLIB) $@ $(LIBDIR)/libdeal_II$(static-lib-suffix): $(o-files) $(extra-o-files) @echo "=====deal.II==========optimized==$(MT)== Linking library: $(@F)" - @$(AR) ru $@ $(o-files) $(extra-o-files) + @rm $@ + @$(AR) r $@ $(o-files) $(extra-o-files) @$(RANLIB) $@ @@ -170,7 +172,7 @@ $(LIBDIR)/libdeal_II$(static-lib-suffix): $(o-files) $(extra-o-files) # them to their final location $(LIBDIR)/libdeal_II.g$(shared-lib-suffix): $(go-files) $(extra-g.o-files) @echo "=====deal.II==========debug======$(MT)== Linking library: $(@F)" - @rm -f $@ + @rm -f $@ $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II.g) @WORKFILE=`mktemp $${TMPDIR:-/tmp}/tmp.XXXXXXXXXX` && \ $(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $$WORKFILE $(call DEAL_II_ADD_SONAME,deal_II.g) $(go-files) $(extra-g.o-files) $(deplibs.g) && \ mv $$WORKFILE $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II.g) @@ -178,7 +180,7 @@ $(LIBDIR)/libdeal_II.g$(shared-lib-suffix): $(go-files) $(extra-g.o-files) $(LIBDIR)/libdeal_II$(shared-lib-suffix): $(o-files) $(extra-o-files) @echo "=====deal.II==========optimized==$(MT)== Linking library: $(@F)" - @rm -f $@ + @rm -f $@ $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II.g) @WORKFILE=`mktemp $${TMPDIR:-/tmp}/tmp.XXXXXXXXXX` && \ $(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $$WORKFILE $(call DEAL_II_ADD_SONAME,deal_II) $(o-files) $(extra-o-files) $(deplibs.o) && \ mv $$WORKFILE $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II) -- 2.39.5