Also re-link libraries if one of the extra-o and extra-g.o files have changed.

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

diff --git a/deal.II/source/Makefile b/deal.II/source/Makefile
index 2f0e71662fc8a61c6574971cf616b3b902214ce1..74a29f5df3998d48e88e2d2b6a1e77037b69d100 100644 (file)
--- a/deal.II/source/Makefile
+++ b/deal.II/source/Makefile
@@ -146,11 +146,11 @@ endif
 
 
 # rules for static libraries
-$(LIBDIR)/libdeal_II.g$(static-lib-suffix): $(go-files)
+$(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)
        @$(RANLIB) $@
-$(LIBDIR)/libdeal_II$(static-lib-suffix): $(o-files)
+$(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)
        @$(RANLIB) $@
@@ -162,7 +162,7 @@ $(LIBDIR)/libdeal_II$(static-lib-suffix): $(o-files)
 # slow on remotely mounted file systems. Consequently, we link in a
 # local file in the $TMPDIR directory, and only after the fact move
 # them to their final location
-$(LIBDIR)/libdeal_II.g$(shared-lib-suffix): $(go-files)
+$(LIBDIR)/libdeal_II.g$(shared-lib-suffix): $(go-files) $(extra-g.o-files)
        @echo "=====deal.II==========debug======$(MT)== Linking library:   $(@F)"
        @rm -f $@
        @WORKFILE=`mktemp $${TMPDIR:-/tmp}/tmp.XXXXXXXXXX` && \
@@ -170,7 +170,7 @@ $(LIBDIR)/libdeal_II.g$(shared-lib-suffix): $(go-files)
                mv $$WORKFILE $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II.g)
        @ln -f -s $(call DEAL_II_SHLIB_NAME,deal_II.g) $@
 
-$(LIBDIR)/libdeal_II$(shared-lib-suffix): $(o-files)
+$(LIBDIR)/libdeal_II$(shared-lib-suffix): $(o-files) $(extra-o-files)
        @echo "=====deal.II==========optimized==$(MT)== Linking library:   $(@F)"
        @rm -f $@
        @WORKFILE=`mktemp $${TMPDIR:-/tmp}/tmp.XXXXXXXXXX` && \