From 9a47322b9fc4c22c8a28c373e90f14ede58a0761 Mon Sep 17 00:00:00 2001 From: wolf Date: Thu, 25 Jul 2002 09:08:49 +0000 Subject: [PATCH] Bring slightly up-to-date. git-svn-id: https://svn.dealii.org/trunk@6276 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/examples/step-1/Makefile | 13 +++---------- deal.II/examples/step-10/Makefile | 11 ++--------- deal.II/examples/step-11/Makefile | 11 ++--------- deal.II/examples/step-12/Makefile | 11 ++--------- deal.II/examples/step-13/Makefile | 11 ++--------- deal.II/examples/step-14/Makefile | 11 ++--------- deal.II/examples/step-2/Makefile | 13 +++---------- deal.II/examples/step-3/Makefile | 11 ++--------- deal.II/examples/step-4/Makefile | 11 ++--------- deal.II/examples/step-5/Makefile | 11 ++--------- deal.II/examples/step-6/Makefile | 11 ++--------- deal.II/examples/step-7/Makefile | 11 ++--------- deal.II/examples/step-8/Makefile | 11 ++--------- deal.II/examples/step-9/Makefile | 11 ++--------- 14 files changed, 30 insertions(+), 128 deletions(-) diff --git a/deal.II/examples/step-1/Makefile b/deal.II/examples/step-1/Makefile index 6a18ca0937..5448e983c6 100644 --- a/deal.II/examples/step-1/Makefile +++ b/deal.II/examples/step-1/Makefile @@ -84,7 +84,7 @@ endif # if you call it without arguments. $(target) : $(libraries) @echo ============================ Linking $@ - @$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS) + @$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS) # To make running the application somewhat independent of the actual @@ -133,21 +133,14 @@ clean: # changed. The following rule to created a dependency file # `Makefile.dep', which `make' uses to determine when to regenerate # the executable. This file is automagically remade whenever needed, -# i.e. whenever one of the cc-(include-path-base)/baseh-files changed. Make detects whether +# i.e. whenever one of the cc-/h-files changed. Make detects whether # to remake this file upon inclusion at the bottom of this file. -# -# The dependency file is created using a perl script. Since the -# script prefixes the output names by `lib(include-path-base)/baseo' or `lib(include-path-base)/basego' (it was -# written for the sublibraries' Makefile), we have to strip that again -# since object files are placed in the present directory for this -# application. All these things are made in the next rule: Makefile.dep: $(target).cc Makefile \ $(shell echo $(include-path-base)/base/*.h \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) - @echo ============================ Remaking Makefile + @echo ============================ Remaking $@ @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) -B. $(target).cc \ - | $(PERL) -pi -e 's!lib/g?o/!!g;' \ > Makefile.dep # To make the dependencies known to `make', we finally have to include diff --git a/deal.II/examples/step-10/Makefile b/deal.II/examples/step-10/Makefile index c906c51a24..f0183efa98 100644 --- a/deal.II/examples/step-10/Makefile +++ b/deal.II/examples/step-10/Makefile @@ -133,21 +133,14 @@ clean: # changed. The following rule to created a dependency file # `Makefile.dep', which `make' uses to determine when to regenerate # the executable. This file is automagically remade whenever needed, -# i.e. whenever one of the cc-(include-path-base)/baseh-files changed. Make detects whether +# i.e. whenever one of the cc-/h-files changed. Make detects whether # to remake this file upon inclusion at the bottom of this file. -# -# The dependency file is created using a perl script. Since the -# script prefixes the output names by `lib(include-path-base)/baseo' or `lib(include-path-base)/basego' (it was -# written for the sublibraries' Makefile), we have to strip that again -# since object files are placed in the present directory for this -# application. All these things are made in the next rule: Makefile.dep: $(target).cc Makefile \ $(shell echo $(include-path-base)/base/*.h \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) - @echo ============================ Remaking Makefile + @echo ============================ Remaking $@ @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) -B. $(target).cc \ - | $(PERL) -pi -e 's!lib/g?o/!!g;' \ > Makefile.dep # To make the dependencies known to `make', we finally have to include diff --git a/deal.II/examples/step-11/Makefile b/deal.II/examples/step-11/Makefile index 50192e901c..5448e983c6 100644 --- a/deal.II/examples/step-11/Makefile +++ b/deal.II/examples/step-11/Makefile @@ -133,21 +133,14 @@ clean: # changed. The following rule to created a dependency file # `Makefile.dep', which `make' uses to determine when to regenerate # the executable. This file is automagically remade whenever needed, -# i.e. whenever one of the cc-(include-path-base)/baseh-files changed. Make detects whether +# i.e. whenever one of the cc-/h-files changed. Make detects whether # to remake this file upon inclusion at the bottom of this file. -# -# The dependency file is created using a perl script. Since the -# script prefixes the output names by `lib(include-path-base)/baseo' or `lib(include-path-base)/basego' (it was -# written for the sublibraries' Makefile), we have to strip that again -# since object files are placed in the present directory for this -# application. All these things are made in the next rule: Makefile.dep: $(target).cc Makefile \ $(shell echo $(include-path-base)/base/*.h \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) - @echo ============================ Remaking Makefile + @echo ============================ Remaking $@ @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) -B. $(target).cc \ - | $(PERL) -pi -e 's!lib/g?o/!!g;' \ > Makefile.dep # To make the dependencies known to `make', we finally have to include diff --git a/deal.II/examples/step-12/Makefile b/deal.II/examples/step-12/Makefile index 50192e901c..5448e983c6 100644 --- a/deal.II/examples/step-12/Makefile +++ b/deal.II/examples/step-12/Makefile @@ -133,21 +133,14 @@ clean: # changed. The following rule to created a dependency file # `Makefile.dep', which `make' uses to determine when to regenerate # the executable. This file is automagically remade whenever needed, -# i.e. whenever one of the cc-(include-path-base)/baseh-files changed. Make detects whether +# i.e. whenever one of the cc-/h-files changed. Make detects whether # to remake this file upon inclusion at the bottom of this file. -# -# The dependency file is created using a perl script. Since the -# script prefixes the output names by `lib(include-path-base)/baseo' or `lib(include-path-base)/basego' (it was -# written for the sublibraries' Makefile), we have to strip that again -# since object files are placed in the present directory for this -# application. All these things are made in the next rule: Makefile.dep: $(target).cc Makefile \ $(shell echo $(include-path-base)/base/*.h \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) - @echo ============================ Remaking Makefile + @echo ============================ Remaking $@ @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) -B. $(target).cc \ - | $(PERL) -pi -e 's!lib/g?o/!!g;' \ > Makefile.dep # To make the dependencies known to `make', we finally have to include diff --git a/deal.II/examples/step-13/Makefile b/deal.II/examples/step-13/Makefile index 50192e901c..5448e983c6 100644 --- a/deal.II/examples/step-13/Makefile +++ b/deal.II/examples/step-13/Makefile @@ -133,21 +133,14 @@ clean: # changed. The following rule to created a dependency file # `Makefile.dep', which `make' uses to determine when to regenerate # the executable. This file is automagically remade whenever needed, -# i.e. whenever one of the cc-(include-path-base)/baseh-files changed. Make detects whether +# i.e. whenever one of the cc-/h-files changed. Make detects whether # to remake this file upon inclusion at the bottom of this file. -# -# The dependency file is created using a perl script. Since the -# script prefixes the output names by `lib(include-path-base)/baseo' or `lib(include-path-base)/basego' (it was -# written for the sublibraries' Makefile), we have to strip that again -# since object files are placed in the present directory for this -# application. All these things are made in the next rule: Makefile.dep: $(target).cc Makefile \ $(shell echo $(include-path-base)/base/*.h \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) - @echo ============================ Remaking Makefile + @echo ============================ Remaking $@ @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) -B. $(target).cc \ - | $(PERL) -pi -e 's!lib/g?o/!!g;' \ > Makefile.dep # To make the dependencies known to `make', we finally have to include diff --git a/deal.II/examples/step-14/Makefile b/deal.II/examples/step-14/Makefile index 50192e901c..5448e983c6 100644 --- a/deal.II/examples/step-14/Makefile +++ b/deal.II/examples/step-14/Makefile @@ -133,21 +133,14 @@ clean: # changed. The following rule to created a dependency file # `Makefile.dep', which `make' uses to determine when to regenerate # the executable. This file is automagically remade whenever needed, -# i.e. whenever one of the cc-(include-path-base)/baseh-files changed. Make detects whether +# i.e. whenever one of the cc-/h-files changed. Make detects whether # to remake this file upon inclusion at the bottom of this file. -# -# The dependency file is created using a perl script. Since the -# script prefixes the output names by `lib(include-path-base)/baseo' or `lib(include-path-base)/basego' (it was -# written for the sublibraries' Makefile), we have to strip that again -# since object files are placed in the present directory for this -# application. All these things are made in the next rule: Makefile.dep: $(target).cc Makefile \ $(shell echo $(include-path-base)/base/*.h \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) - @echo ============================ Remaking Makefile + @echo ============================ Remaking $@ @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) -B. $(target).cc \ - | $(PERL) -pi -e 's!lib/g?o/!!g;' \ > Makefile.dep # To make the dependencies known to `make', we finally have to include diff --git a/deal.II/examples/step-2/Makefile b/deal.II/examples/step-2/Makefile index 270ee163a7..afa15bfdd6 100644 --- a/deal.II/examples/step-2/Makefile +++ b/deal.II/examples/step-2/Makefile @@ -84,7 +84,7 @@ endif # if you call it without arguments. $(target) : $(libraries) @echo ============================ Linking $@ - @$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS) + @$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS) # To make running the application somewhat independent of the actual @@ -133,21 +133,14 @@ clean: # changed. The following rule to created a dependency file # `Makefile.dep', which `make' uses to determine when to regenerate # the executable. This file is automagically remade whenever needed, -# i.e. whenever one of the cc-(include-path-base)/baseh-files changed. Make detects whether +# i.e. whenever one of the cc-/h-files changed. Make detects whether # to remake this file upon inclusion at the bottom of this file. -# -# The dependency file is created using a perl script. Since the -# script prefixes the output names by `lib(include-path-base)/baseo' or `lib(include-path-base)/basego' (it was -# written for the sublibraries' Makefile), we have to strip that again -# since object files are placed in the present directory for this -# application. All these things are made in the next rule: Makefile.dep: $(target).cc Makefile \ $(shell echo $(include-path-base)/base/*.h \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) - @echo ============================ Remaking Makefile + @echo ============================ Remaking $@ @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) -B. $(target).cc \ - | $(PERL) -pi -e 's!lib/g?o/!!g;' \ > Makefile.dep # To make the dependencies known to `make', we finally have to include diff --git a/deal.II/examples/step-3/Makefile b/deal.II/examples/step-3/Makefile index 50192e901c..5448e983c6 100644 --- a/deal.II/examples/step-3/Makefile +++ b/deal.II/examples/step-3/Makefile @@ -133,21 +133,14 @@ clean: # changed. The following rule to created a dependency file # `Makefile.dep', which `make' uses to determine when to regenerate # the executable. This file is automagically remade whenever needed, -# i.e. whenever one of the cc-(include-path-base)/baseh-files changed. Make detects whether +# i.e. whenever one of the cc-/h-files changed. Make detects whether # to remake this file upon inclusion at the bottom of this file. -# -# The dependency file is created using a perl script. Since the -# script prefixes the output names by `lib(include-path-base)/baseo' or `lib(include-path-base)/basego' (it was -# written for the sublibraries' Makefile), we have to strip that again -# since object files are placed in the present directory for this -# application. All these things are made in the next rule: Makefile.dep: $(target).cc Makefile \ $(shell echo $(include-path-base)/base/*.h \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) - @echo ============================ Remaking Makefile + @echo ============================ Remaking $@ @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) -B. $(target).cc \ - | $(PERL) -pi -e 's!lib/g?o/!!g;' \ > Makefile.dep # To make the dependencies known to `make', we finally have to include diff --git a/deal.II/examples/step-4/Makefile b/deal.II/examples/step-4/Makefile index d35afde185..0761bd0557 100644 --- a/deal.II/examples/step-4/Makefile +++ b/deal.II/examples/step-4/Makefile @@ -135,21 +135,14 @@ clean: # changed. The following rule to created a dependency file # `Makefile.dep', which `make' uses to determine when to regenerate # the executable. This file is automagically remade whenever needed, -# i.e. whenever one of the cc-(include-path-base)/baseh-files changed. Make detects whether +# i.e. whenever one of the cc-/h-files changed. Make detects whether # to remake this file upon inclusion at the bottom of this file. -# -# The dependency file is created using a perl script. Since the -# script prefixes the output names by `lib(include-path-base)/baseo' or `lib(include-path-base)/basego' (it was -# written for the sublibraries' Makefile), we have to strip that again -# since object files are placed in the present directory for this -# application. All these things are made in the next rule: Makefile.dep: $(target).cc Makefile \ $(shell echo $(include-path-base)/base/*.h \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) - @echo ============================ Remaking Makefile + @echo ============================ Remaking $@ @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) -B. $(target).cc \ - | $(PERL) -pi -e 's!lib/g?o/!!g;' \ > Makefile.dep # To make the dependencies known to `make', we finally have to include diff --git a/deal.II/examples/step-5/Makefile b/deal.II/examples/step-5/Makefile index 50192e901c..5448e983c6 100644 --- a/deal.II/examples/step-5/Makefile +++ b/deal.II/examples/step-5/Makefile @@ -133,21 +133,14 @@ clean: # changed. The following rule to created a dependency file # `Makefile.dep', which `make' uses to determine when to regenerate # the executable. This file is automagically remade whenever needed, -# i.e. whenever one of the cc-(include-path-base)/baseh-files changed. Make detects whether +# i.e. whenever one of the cc-/h-files changed. Make detects whether # to remake this file upon inclusion at the bottom of this file. -# -# The dependency file is created using a perl script. Since the -# script prefixes the output names by `lib(include-path-base)/baseo' or `lib(include-path-base)/basego' (it was -# written for the sublibraries' Makefile), we have to strip that again -# since object files are placed in the present directory for this -# application. All these things are made in the next rule: Makefile.dep: $(target).cc Makefile \ $(shell echo $(include-path-base)/base/*.h \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) - @echo ============================ Remaking Makefile + @echo ============================ Remaking $@ @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) -B. $(target).cc \ - | $(PERL) -pi -e 's!lib/g?o/!!g;' \ > Makefile.dep # To make the dependencies known to `make', we finally have to include diff --git a/deal.II/examples/step-6/Makefile b/deal.II/examples/step-6/Makefile index 50192e901c..5448e983c6 100644 --- a/deal.II/examples/step-6/Makefile +++ b/deal.II/examples/step-6/Makefile @@ -133,21 +133,14 @@ clean: # changed. The following rule to created a dependency file # `Makefile.dep', which `make' uses to determine when to regenerate # the executable. This file is automagically remade whenever needed, -# i.e. whenever one of the cc-(include-path-base)/baseh-files changed. Make detects whether +# i.e. whenever one of the cc-/h-files changed. Make detects whether # to remake this file upon inclusion at the bottom of this file. -# -# The dependency file is created using a perl script. Since the -# script prefixes the output names by `lib(include-path-base)/baseo' or `lib(include-path-base)/basego' (it was -# written for the sublibraries' Makefile), we have to strip that again -# since object files are placed in the present directory for this -# application. All these things are made in the next rule: Makefile.dep: $(target).cc Makefile \ $(shell echo $(include-path-base)/base/*.h \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) - @echo ============================ Remaking Makefile + @echo ============================ Remaking $@ @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) -B. $(target).cc \ - | $(PERL) -pi -e 's!lib/g?o/!!g;' \ > Makefile.dep # To make the dependencies known to `make', we finally have to include diff --git a/deal.II/examples/step-7/Makefile b/deal.II/examples/step-7/Makefile index 30399983e9..1d6c5b3b0e 100644 --- a/deal.II/examples/step-7/Makefile +++ b/deal.II/examples/step-7/Makefile @@ -133,21 +133,14 @@ clean: # changed. The following rule to created a dependency file # `Makefile.dep', which `make' uses to determine when to regenerate # the executable. This file is automagically remade whenever needed, -# i.e. whenever one of the cc-(include-path-base)/baseh-files changed. Make detects whether +# i.e. whenever one of the cc-/h-files changed. Make detects whether # to remake this file upon inclusion at the bottom of this file. -# -# The dependency file is created using a perl script. Since the -# script prefixes the output names by `lib(include-path-base)/baseo' or `lib(include-path-base)/basego' (it was -# written for the sublibraries' Makefile), we have to strip that again -# since object files are placed in the present directory for this -# application. All these things are made in the next rule: Makefile.dep: $(target).cc Makefile \ $(shell echo $(include-path-base)/base/*.h \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) - @echo ============================ Remaking Makefile + @echo ============================ Remaking $@ @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) -B. $(target).cc \ - | $(PERL) -pi -e 's!lib/g?o/!!g;' \ > Makefile.dep # To make the dependencies known to `make', we finally have to include diff --git a/deal.II/examples/step-8/Makefile b/deal.II/examples/step-8/Makefile index 50192e901c..5448e983c6 100644 --- a/deal.II/examples/step-8/Makefile +++ b/deal.II/examples/step-8/Makefile @@ -133,21 +133,14 @@ clean: # changed. The following rule to created a dependency file # `Makefile.dep', which `make' uses to determine when to regenerate # the executable. This file is automagically remade whenever needed, -# i.e. whenever one of the cc-(include-path-base)/baseh-files changed. Make detects whether +# i.e. whenever one of the cc-/h-files changed. Make detects whether # to remake this file upon inclusion at the bottom of this file. -# -# The dependency file is created using a perl script. Since the -# script prefixes the output names by `lib(include-path-base)/baseo' or `lib(include-path-base)/basego' (it was -# written for the sublibraries' Makefile), we have to strip that again -# since object files are placed in the present directory for this -# application. All these things are made in the next rule: Makefile.dep: $(target).cc Makefile \ $(shell echo $(include-path-base)/base/*.h \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) - @echo ============================ Remaking Makefile + @echo ============================ Remaking $@ @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) -B. $(target).cc \ - | $(PERL) -pi -e 's!lib/g?o/!!g;' \ > Makefile.dep # To make the dependencies known to `make', we finally have to include diff --git a/deal.II/examples/step-9/Makefile b/deal.II/examples/step-9/Makefile index 50192e901c..5448e983c6 100644 --- a/deal.II/examples/step-9/Makefile +++ b/deal.II/examples/step-9/Makefile @@ -133,21 +133,14 @@ clean: # changed. The following rule to created a dependency file # `Makefile.dep', which `make' uses to determine when to regenerate # the executable. This file is automagically remade whenever needed, -# i.e. whenever one of the cc-(include-path-base)/baseh-files changed. Make detects whether +# i.e. whenever one of the cc-/h-files changed. Make detects whether # to remake this file upon inclusion at the bottom of this file. -# -# The dependency file is created using a perl script. Since the -# script prefixes the output names by `lib(include-path-base)/baseo' or `lib(include-path-base)/basego' (it was -# written for the sublibraries' Makefile), we have to strip that again -# since object files are placed in the present directory for this -# application. All these things are made in the next rule: Makefile.dep: $(target).cc Makefile \ $(shell echo $(include-path-base)/base/*.h \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) - @echo ============================ Remaking Makefile + @echo ============================ Remaking $@ @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) -B. $(target).cc \ - | $(PERL) -pi -e 's!lib/g?o/!!g;' \ > Makefile.dep # To make the dependencies known to `make', we finally have to include -- 2.39.5