From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Thu, 28 Oct 2010 15:00:43 +0000 (+0000)
Subject: Bring Makefiles up to date.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=400270798e6e3d62337b560cb20af6617fe90fd3;p=dealii-svn.git

Bring Makefiles up to date.

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

diff --git a/deal.II/examples/step-1/Makefile b/deal.II/examples/step-1/Makefile
index 242b6f8a4c..486944be22 100644
--- a/deal.II/examples/step-1/Makefile
+++ b/deal.II/examples/step-1/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F) $@
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-10/Makefile b/deal.II/examples/step-10/Makefile
index c417c88cdf..a54a5f9b86 100644
--- a/deal.II/examples/step-10/Makefile
+++ b/deal.II/examples/step-10/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-11/Makefile b/deal.II/examples/step-11/Makefile
index 173e1f02e6..59c988d068 100644
--- a/deal.II/examples/step-11/Makefile
+++ b/deal.II/examples/step-11/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-12/Makefile b/deal.II/examples/step-12/Makefile
index 173e1f02e6..59c988d068 100644
--- a/deal.II/examples/step-12/Makefile
+++ b/deal.II/examples/step-12/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-13/Makefile b/deal.II/examples/step-13/Makefile
index 173e1f02e6..59c988d068 100644
--- a/deal.II/examples/step-13/Makefile
+++ b/deal.II/examples/step-13/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-14/Makefile b/deal.II/examples/step-14/Makefile
index 173e1f02e6..59c988d068 100644
--- a/deal.II/examples/step-14/Makefile
+++ b/deal.II/examples/step-14/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-15/Makefile b/deal.II/examples/step-15/Makefile
index 879b8bc2f7..ff79b7915d 100644
--- a/deal.II/examples/step-15/Makefile
+++ b/deal.II/examples/step-15/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 1d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-16/Makefile b/deal.II/examples/step-16/Makefile
index f80932a3fe..4d9e4cd1a0 100644
--- a/deal.II/examples/step-16/Makefile
+++ b/deal.II/examples/step-16/Makefile
@@ -47,17 +47,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -65,8 +59,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -78,9 +72,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -89,7 +83,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -112,7 +106,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -141,7 +135,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-17/Makefile b/deal.II/examples/step-17/Makefile
index b69e8849c8..efabcd42e8 100644
--- a/deal.II/examples/step-17/Makefile
+++ b/deal.II/examples/step-17/Makefile
@@ -80,17 +80,11 @@ else
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -98,8 +92,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -111,9 +105,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -122,7 +116,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -145,7 +139,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -174,7 +168,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-18/Makefile b/deal.II/examples/step-18/Makefile
index f677ce9088..2b45a3cfb9 100644
--- a/deal.II/examples/step-18/Makefile
+++ b/deal.II/examples/step-18/Makefile
@@ -45,7 +45,7 @@ clean-up-files = *gmv *gnuplot *gpl *eps *pov *d2
 # settings
 include $D/common/Make.global_options
 
-################################################################ 
+################################################################
 # This example program will only work if PETSc is installed. If this
 # is not the case, then simply redefine the main targets to do nothing
 #
@@ -55,7 +55,7 @@ ifneq ($(USE_CONTRIB_PETSC)$(enable-threads),yesno)
   ifneq ($(USE_CONTRIB_PETSC),yes)
 default run clean:
 	@echo
-	@echo "===========================================================" 
+	@echo "==========================================================="
 	@echo "=   This program cannot be compiled without PETSc. Make   ="
 	@echo "=   sure you have PETSc installed and detected during     ="
 	@echo "=   configuration of deal.II                              ="
@@ -64,7 +64,7 @@ default run clean:
   else
 default run clean:
 	@echo
-	@echo "===========================================================" 
+	@echo "==========================================================="
 	@echo "=   PETSc can not be used when running programs on        ="
 	@echo "=   multiple threads. Make sure you have specified the    ="
 	@echo "=   --disable-threads flag upon configuration of deal.II  ="
@@ -80,17 +80,11 @@ else
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 3d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -98,8 +92,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -111,9 +105,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -122,7 +116,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -145,7 +139,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -174,7 +168,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-19/Makefile b/deal.II/examples/step-19/Makefile
index 173e1f02e6..59c988d068 100644
--- a/deal.II/examples/step-19/Makefile
+++ b/deal.II/examples/step-19/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-2/Makefile b/deal.II/examples/step-2/Makefile
index dd5f4d43c1..030d9f8570 100644
--- a/deal.II/examples/step-2/Makefile
+++ b/deal.II/examples/step-2/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-20/Makefile b/deal.II/examples/step-20/Makefile
index 173e1f02e6..59c988d068 100644
--- a/deal.II/examples/step-20/Makefile
+++ b/deal.II/examples/step-20/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-21/Makefile b/deal.II/examples/step-21/Makefile
index 1c7df30f7b..a5ff390828 100644
--- a/deal.II/examples/step-21/Makefile
+++ b/deal.II/examples/step-21/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-22/Makefile b/deal.II/examples/step-22/Makefile
index 1c7df30f7b..a5ff390828 100644
--- a/deal.II/examples/step-22/Makefile
+++ b/deal.II/examples/step-22/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-23/Makefile b/deal.II/examples/step-23/Makefile
index 2d50786bc9..6f04662317 100644
--- a/deal.II/examples/step-23/Makefile
+++ b/deal.II/examples/step-23/Makefile
@@ -49,17 +49,11 @@ include $D/common/Make.global_options
 ################################################################
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -67,8 +61,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -80,9 +74,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -91,7 +85,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -114,7 +108,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -143,7 +137,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-24/Makefile b/deal.II/examples/step-24/Makefile
index 2d50786bc9..6f04662317 100644
--- a/deal.II/examples/step-24/Makefile
+++ b/deal.II/examples/step-24/Makefile
@@ -49,17 +49,11 @@ include $D/common/Make.global_options
 ################################################################
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -67,8 +61,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -80,9 +74,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -91,7 +85,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -114,7 +108,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -143,7 +137,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-25/Makefile b/deal.II/examples/step-25/Makefile
index f5b15fa0c8..4da23a361c 100644
--- a/deal.II/examples/step-25/Makefile
+++ b/deal.II/examples/step-25/Makefile
@@ -49,17 +49,11 @@ include $D/common/Make.global_options
 ################################################################
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -67,8 +61,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -80,9 +74,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -91,7 +85,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -114,7 +108,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -143,7 +137,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-26/Makefile b/deal.II/examples/step-26/Makefile
index 3bfb8e1866..1a2995af34 100644
--- a/deal.II/examples/step-26/Makefile
+++ b/deal.II/examples/step-26/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-27/Makefile b/deal.II/examples/step-27/Makefile
index af1fc1197f..7ea9c75ede 100644
--- a/deal.II/examples/step-27/Makefile
+++ b/deal.II/examples/step-27/Makefile
@@ -49,17 +49,11 @@ include $D/common/Make.global_options
 ################################################################
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -67,8 +61,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -80,9 +74,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -91,7 +85,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -114,7 +108,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -143,7 +137,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-28/Makefile b/deal.II/examples/step-28/Makefile
index 7f95d0bbeb..5bc46cd705 100644
--- a/deal.II/examples/step-28/Makefile
+++ b/deal.II/examples/step-28/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-29/Makefile b/deal.II/examples/step-29/Makefile
index 7ce82fc092..958d00ef0b 100644
--- a/deal.II/examples/step-29/Makefile
+++ b/deal.II/examples/step-29/Makefile
@@ -49,17 +49,11 @@ include $D/common/Make.global_options
 ################################################################
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -67,8 +61,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -80,9 +74,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -91,7 +85,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -114,7 +108,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -143,7 +137,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-3/Makefile b/deal.II/examples/step-3/Makefile
index 173e1f02e6..59c988d068 100644
--- a/deal.II/examples/step-3/Makefile
+++ b/deal.II/examples/step-3/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-30/Makefile b/deal.II/examples/step-30/Makefile
index 173e1f02e6..59c988d068 100644
--- a/deal.II/examples/step-30/Makefile
+++ b/deal.II/examples/step-30/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-31/Makefile b/deal.II/examples/step-31/Makefile
index c9208e3922..a0ca07dd7c 100644
--- a/deal.II/examples/step-31/Makefile
+++ b/deal.II/examples/step-31/Makefile
@@ -67,17 +67,11 @@ else
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -85,8 +79,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -98,9 +92,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -109,7 +103,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -133,7 +127,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -163,7 +157,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-32/Makefile b/deal.II/examples/step-32/Makefile
index 45c72490b2..0a1e843c07 100644
--- a/deal.II/examples/step-32/Makefile
+++ b/deal.II/examples/step-32/Makefile
@@ -67,17 +67,11 @@ else
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -85,8 +79,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -98,9 +92,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -109,7 +103,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -133,7 +127,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -163,7 +157,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-33/Makefile b/deal.II/examples/step-33/Makefile
index 4827074bcd..7f21cdc7fc 100644
--- a/deal.II/examples/step-33/Makefile
+++ b/deal.II/examples/step-33/Makefile
@@ -74,17 +74,11 @@ else
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -92,8 +86,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -105,9 +99,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -116,7 +110,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT) $(run-parameters)
 
@@ -139,7 +133,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -168,7 +162,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-34/Makefile b/deal.II/examples/step-34/Makefile
index 41023930ff..2fa0b3001c 100644
--- a/deal.II/examples/step-34/Makefile
+++ b/deal.II/examples/step-34/Makefile
@@ -49,17 +49,11 @@ include $D/common/Make.global_options
 ################################################################
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -67,8 +61,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -80,9 +74,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -91,7 +85,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -114,7 +108,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -143,7 +137,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-35/Makefile b/deal.II/examples/step-35/Makefile
index 6e7f2449a6..4860d54eb7 100755
--- a/deal.II/examples/step-35/Makefile
+++ b/deal.II/examples/step-35/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-36/Makefile b/deal.II/examples/step-36/Makefile
index 63f0193b4f..f67c75f12f 100644
--- a/deal.II/examples/step-36/Makefile
+++ b/deal.II/examples/step-36/Makefile
@@ -77,17 +77,11 @@ else
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -95,8 +89,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -108,9 +102,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -119,7 +113,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -142,7 +136,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -171,7 +165,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-37/Makefile b/deal.II/examples/step-37/Makefile
index 0f7cb610f9..443e8f6149 100644
--- a/deal.II/examples/step-37/Makefile
+++ b/deal.II/examples/step-37/Makefile
@@ -49,17 +49,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -67,8 +61,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -80,9 +74,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -91,7 +85,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -114,7 +108,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -143,7 +137,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-39/Makefile b/deal.II/examples/step-39/Makefile
index fd7bac01f2..b66d81e0da 100644
--- a/deal.II/examples/step-39/Makefile
+++ b/deal.II/examples/step-39/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 	@echo ============================ Postprocessing to step-39.dat
@@ -114,7 +108,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -143,7 +137,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-4/Makefile b/deal.II/examples/step-4/Makefile
index 173e1f02e6..59c988d068 100644
--- a/deal.II/examples/step-4/Makefile
+++ b/deal.II/examples/step-4/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-40/Makefile b/deal.II/examples/step-40/Makefile
index 0264266a90..d51b3d7721 100644
--- a/deal.II/examples/step-40/Makefile
+++ b/deal.II/examples/step-40/Makefile
@@ -81,17 +81,11 @@ else
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -99,8 +93,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -112,9 +106,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -123,7 +117,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -147,7 +141,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -177,7 +171,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-42/Makefile b/deal.II/examples/step-42/Makefile
index 1c7df30f7b..a5ff390828 100644
--- a/deal.II/examples/step-42/Makefile
+++ b/deal.II/examples/step-42/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-45/Makefile b/deal.II/examples/step-45/Makefile
index cfd76a0086..2fb0539b72 100644
--- a/deal.II/examples/step-45/Makefile
+++ b/deal.II/examples/step-45/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-5/Makefile b/deal.II/examples/step-5/Makefile
index 173e1f02e6..59c988d068 100644
--- a/deal.II/examples/step-5/Makefile
+++ b/deal.II/examples/step-5/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-6/Makefile b/deal.II/examples/step-6/Makefile
index 173e1f02e6..59c988d068 100644
--- a/deal.II/examples/step-6/Makefile
+++ b/deal.II/examples/step-6/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-7/Makefile b/deal.II/examples/step-7/Makefile
index f3e181e7b9..a12001cf4c 100644
--- a/deal.II/examples/step-7/Makefile
+++ b/deal.II/examples/step-7/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-8/Makefile b/deal.II/examples/step-8/Makefile
index 173e1f02e6..59c988d068 100644
--- a/deal.II/examples/step-8/Makefile
+++ b/deal.II/examples/step-8/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep
diff --git a/deal.II/examples/step-9/Makefile b/deal.II/examples/step-9/Makefile
index 173e1f02e6..59c988d068 100644
--- a/deal.II/examples/step-9/Makefile
+++ b/deal.II/examples/step-9/Makefile
@@ -48,17 +48,11 @@ include $D/common/Make.global_options
 
 # Since the whole project consists of only one file, we need not
 # consider difficult dependencies. We only have to declare the
-# libraries which we want to link to the object file, and there need
-# to be two sets of libraries: one for the debug mode version of the
-# application and one for the optimized mode. Here we have selected
-# the versions for 2d. Note that the order in which the libraries are
-# given here is important and that your applications won't link
-# properly if they are given in another order.
-#
-# You may need to augment the lists of libraries when compiling your
-# program for other dimensions, or when using third party libraries
-libs.g   = $(lib-deal2.g)
-libs.o   = $(lib-deal2.o)
+# libraries which we want to link to the object file. deal.II has two
+# libraries: one for the debug mode version of the
+# application and one for optimized mode.
+libs.g   := $(lib-deal2.g)
+libs.o   := $(lib-deal2.o)
 
 
 # We now use the variable defined above which switch between debug and
@@ -66,8 +60,8 @@ libs.o   = $(lib-deal2.o)
 # in the list of libraries is the name of the object file which we
 # will produce from the single C++ file. Note that by default we use
 # the extension .g.o for object files compiled in debug mode and .o for
-# object files in optimized mode (or whatever the local default on your
-# system is instead of .o).
+# object files in optimized mode (or whatever local default on your
+# system is instead of .o)
 ifeq ($(debug-mode),on)
   libraries = $(target).g.$(OBJEXT) $(libs.g)
 else
@@ -79,9 +73,9 @@ endif
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects
 # if you call it without arguments.
-$(target) : $(libraries)
+$(target)$(EXEEXT) : $(libraries)
 	@echo ============================ Linking $@
-	@$(CXX) -o $@$(EXEEXT) $^ $(LIBS) $(LDFLAGS)
+	@$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 
 # To make running the application somewhat independent of the actual
@@ -90,7 +84,7 @@ $(target) : $(libraries)
 # useful if you want to call the executable with arguments which do
 # not change frequently. You may then want to add them to the
 # following rule:
-run: $(target)
+run: $(target)$(EXEEXT)
 	@echo ============================ Running $<
 	@./$(target)$(EXEEXT)
 
@@ -113,7 +107,7 @@ clean:
 	@echo ==============debug========= $(<F)
 	@$(CXX) $(CXXFLAGS.g) -c $< -o $@
 ./%.$(OBJEXT) :
-	@echo ==============optimized===== $(<F)
+	@echo ==============optimized===== $(<F) $@
 	@$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
@@ -142,7 +136,6 @@ Makefile.dep: $(target).cc Makefile \
 	  || (rm -f $@ ; false)
 	@if test -s $@ ; then : else rm $@ ; fi
 
-
 # To make the dependencies known to `make', we finally have to include
 # them:
 include Makefile.dep