From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Sun, 11 Jul 2010 23:20:30 +0000 (+0000)
Subject: Take over patch 21469 from mainline.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1225e024efb9e5e4833007524c7ea3421ca12ca8;p=dealii-svn.git

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 bf01fcb5e1..58ee0b3d19 100644
--- 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 a82c9e6a11..ce56af9971 100644
--- 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) \