Take over patch 21469 from mainline.

git-svn-id: https://svn.dealii.org/branches/releases/Branch-6-3@21470 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/deal.II/Makefile b/deal.II/deal.II/Makefile
index bf01fcb5e185af16565dfd03d1912c30426fd794..58ee0b3d19dc1a0255103c639d0cf2efbfb3eae0 100644 (file)
--- a/deal.II/deal.II/Makefile
+++ b/deal.II/deal.II/Makefile
@@ -72,8 +72,7 @@ $(LIBDIR)/3d/%.$(OBJEXT) :
        @echo "=====deal.II====3d====optimized==$(MT)== $(<:$D/deal.II/source/%=%)"
        @$(CXX) $(CXXFLAGS.o) -Ddeal_II_dimension=3 -c $< -o $@
 
-source/%.inst : source/%.inst.in $D/common/template-arguments \
-               $D/common/scripts/expand_instantiations
+source/%.inst : source/%.inst.in $D/common/template-arguments
        @echo "=====deal.II========================= $(@F)"
        @$D/common/scripts/expand_instantiations $D/common/template-arguments < $< > $@
 

diff --git a/deal.II/lac/Makefile b/deal.II/lac/Makefile
index a82c9e6a115f7a5345b383207c7378e3b6ad9cc3..ce56af9971243b2c1a9bc6513258e5cf2792fc93 100644 (file)
--- a/deal.II/lac/Makefile
+++ b/deal.II/lac/Makefile
@@ -37,8 +37,7 @@ $(LIBDIR)/lac/%.$(OBJEXT) :
        @echo "=====lac==============optimized==$(MT)== $(<F)"
        @$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
-source/%.inst : source/%.inst.in $D/common/template-arguments \
-               $D/common/scripts/expand_instantiations
+source/%.inst : source/%.inst.in $D/common/template-arguments
        @echo "=====lac============================= $(@F)"
        @$D/common/scripts/expand_instantiations $D/common/template-arguments < $< > $@
 
@@ -144,8 +143,7 @@ clean:
 #
 # If the command fails, then remove Makefile.dep again and fail
 Makefile.dep: include/lac/lapack_templates.h \
-             $(cc-files) $(h-files) \
-               $(inst-files) \
+             $(cc-files) $(h-files) $(inst-files) \
                Makefile $D/common/Make.global_options
        @echo ===================================== Remaking lac/Makefile
        @$D/common/scripts/make_dependencies $(INCLUDE) "-B$(LIBDIR)/lac" $(cc-files) \