From 6f3169e15ea5fc72ac4687444b472d2c26602800 Mon Sep 17 00:00:00 2001 From: wolf Date: Mon, 22 Apr 2002 08:43:10 +0000 Subject: [PATCH] Replace all direct references to perl in Makefiles by $(PERL) git-svn-id: https://svn.dealii.org/trunk@5702 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/common/Make.rules | 2 +- deal.II/contrib/hsl/Makefile | 2 +- deal.II/contrib/utilities/Makefile.in | 2 +- deal.II/doc/auto/kdoc/Makefile.in | 6 +++--- deal.II/doc/development/Makefile.large | 4 ++-- deal.II/doc/development/Makefile.small | 4 ++-- deal.II/doc/tutorial/chapter-2.step-by-step/Makefile | 10 +++++----- deal.II/doc/tutorial/chapter-3.laplace/code/Makefile | 2 +- deal.II/examples/step-1/Makefile | 4 ++-- deal.II/examples/step-10/Makefile | 4 ++-- deal.II/examples/step-11/Makefile | 4 ++-- deal.II/examples/step-12/Makefile | 4 ++-- deal.II/examples/step-13/Makefile | 4 ++-- deal.II/examples/step-2/Makefile | 4 ++-- deal.II/examples/step-3/Makefile | 4 ++-- deal.II/examples/step-4/Makefile | 4 ++-- deal.II/examples/step-5/Makefile | 4 ++-- deal.II/examples/step-6/Makefile | 4 ++-- deal.II/examples/step-7/Makefile | 4 ++-- deal.II/examples/step-8/Makefile | 4 ++-- deal.II/examples/step-9/Makefile | 4 ++-- 21 files changed, 42 insertions(+), 42 deletions(-) diff --git a/deal.II/common/Make.rules b/deal.II/common/Make.rules index a9d6429468..2c2533f0f2 100644 --- a/deal.II/common/Make.rules +++ b/deal.II/common/Make.rules @@ -33,6 +33,6 @@ all-cc-files = $(shell echo *.cc) Makefile.depend: $(all-cc-files) @echo =====Dependencies== Makefile.depend @$(CXX) $(flags) $^ -M > $@ - @perl -pi~ -e 's/(^[^.]+)\.o:/\1.o \1.g.o:/;' $@ + @$(PERL) -pi~ -e 's/(^[^.]+)\.o:/\1.o \1.g.o:/;' $@ include Makefile.depend diff --git a/deal.II/contrib/hsl/Makefile b/deal.II/contrib/hsl/Makefile index 730e20862e..8d29a1208d 100644 --- a/deal.II/contrib/hsl/Makefile +++ b/deal.II/contrib/hsl/Makefile @@ -60,7 +60,7 @@ Makefile.dep: $(f-files) Makefile @echo ============================ Remaking Makefile @(if test "x$(f-files)" != "x" ; then \ for i in source/*.f ; do \ - echo $$i | perl -pi -e 's#source/(.*)\.f#\$$(LIBDIR)/contrib/hsl/\1.o:source/\1.f#;' ;\ + echo $$i | $(PERL) -pi -e 's#source/(.*)\.f#\$$(LIBDIR)/contrib/hsl/\1.o:source/\1.f#;' ;\ done ; \ fi) \ > Makefile.dep diff --git a/deal.II/contrib/utilities/Makefile.in b/deal.II/contrib/utilities/Makefile.in index 2a7bf3a21d..eac4814f59 100644 --- a/deal.II/contrib/utilities/Makefile.in +++ b/deal.II/contrib/utilities/Makefile.in @@ -53,6 +53,6 @@ interpolation.exe: interpolation.o $(libraries) Makefile.depend: $(shell echo *.cc) @echo =====Dependencies== $@ @$(CXX) $(CXXFLAGS.g) $^ -M > $@ - @perl -pi -e 's/(^[^.]+)\.o:/\1.o \1.g.o:/;' $@ + @$(PERL) -pi -e 's/(^[^.]+)\.o:/\1.o \1.g.o:/;' $@ include Makefile.depend diff --git a/deal.II/doc/auto/kdoc/Makefile.in b/deal.II/doc/auto/kdoc/Makefile.in index e7d0998f61..5a4da1d6e4 100644 --- a/deal.II/doc/auto/kdoc/Makefile.in +++ b/deal.II/doc/auto/kdoc/Makefile.in @@ -95,19 +95,19 @@ multigrid-html-files: kdoc-installed $(kdoc.multigrid) %-fix-files: for htmlfile in $(subst -fix-files,,$@)/*html ; do \ echo "Fixing include paths in $$htmlfile..." ; \ - perl -pi -e 's,(#include <)$D/?[^/]+/include/,$$1,g; \ + $(PERL) -pi -e 's,(#include <)$D/?[^/]+/include/,$$1,g; \ s,

Source: $D/?(.*)

,

Source: $$1

,g;' "$$htmlfile" ;\ done for htmlfile in $(subst -fix-files,,$@)/header-list.html $(subst -fix-files,,$@)/all-globals.html ; do \ echo "Fixing include paths in special file $$htmlfile..." ; \ case "$$htmlfile" in \ *header-list*) \ - perl -pi -e 's,$D/?[^/]+/include/(.*?) - $D/?[^/]+/include/(.*?),$$1 - $$2,g; \ + $(PERL) -pi -e 's,$D/?[^/]+/include/(.*?) - $D/?[^/]+/include/(.*?),$$1 - $$2,g; \ s,()$D/?[^/]+/include/,$$1,g;' \ "$$htmlfile" ;\ ;; \ *all-globals*) \ - perl -pi -e 's,()$D/?[^/]+/include/,$$1,g;' \ + $(PERL) -pi -e 's,()$D/?[^/]+/include/,$$1,g;' \ "$$htmlfile" ;\ ;; \ *) \ diff --git a/deal.II/doc/development/Makefile.large b/deal.II/doc/development/Makefile.large index c1c7a3df29..c922bc1c83 100644 --- a/deal.II/doc/development/Makefile.large +++ b/deal.II/doc/development/Makefile.large @@ -137,8 +137,8 @@ clean-data: # `lib/'. lib/Makefile.dep: $(cc-files) $(h-files) $(lib-h-files) Makefile @echo =====waves=======$(deal_II_dimension)d================== Remaking Makefile - @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(cc-files) \ - | perl -p -e 's!^lib/g?o/(.*):!lib/$(deal_II_dimension)d/$$1:!g;' \ + @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) $(cc-files) \ + | $(PERL) -p -e 's!^lib/g?o/(.*):!lib/$(deal_II_dimension)d/$$1:!g;' \ > lib/Makefile.dep include lib/Makefile.dep diff --git a/deal.II/doc/development/Makefile.small b/deal.II/doc/development/Makefile.small index 33919d51ca..ef55e92397 100644 --- a/deal.II/doc/development/Makefile.small +++ b/deal.II/doc/development/Makefile.small @@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) @echo ============================ Remaking Makefile - @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(target).cc \ - | perl -pi -e 's!lib/g?o/!!g;' \ + @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) $(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/doc/tutorial/chapter-2.step-by-step/Makefile b/deal.II/doc/tutorial/chapter-2.step-by-step/Makefile index 3a357bf9af..96aa7bbca3 100644 --- a/deal.II/doc/tutorial/chapter-2.step-by-step/Makefile +++ b/deal.II/doc/tutorial/chapter-2.step-by-step/Makefile @@ -15,13 +15,13 @@ all: $(example-htmls) $(example-htmls): @echo ================== Assembling $@ @TOC=`cat $D/examples/$(@:.html=)/$(@:.html=.cc) \ - | perl program2toc \ - | perl -pi -e 's/\"/\\\"/g;'` ; \ + | $(PERL) program2toc \ + | $(PERL) -pi -e 's/\"/\\\"/g;'` ; \ cat head.html \ - | perl -pi -e '$$step="$@"; \ + | $(PERL) -pi -e '$$step="$@"; \ $$step=~s/step-(\d+).html/$$1/g; \ s/step xxx/step $$step/g;' \ - | perl -pi -e "s!TOC!$$TOC!g;" \ + | $(PERL) -pi -e "s!TOC!$$TOC!g;" \ > $@ @cat $(@:.html=.data/intro.html) >> $@ @cat $D/examples/$(@:.html=)/$(@:.html=.cc) \ @@ -65,7 +65,7 @@ $(example-sgmls): step-by-step.sgml: $(example-sgmls) @echo ================== Concating $@ @cat step-by-step.header.sgml \ - | perl -pi -e 's/TODAY/$(shell date)/;' \ + | $(PERL) -pi -e 's/TODAY/$(shell date)/;' \ > $@ @for step in $(example-names) ; do \ echo "$$step" >> $@ ; \ diff --git a/deal.II/doc/tutorial/chapter-3.laplace/code/Makefile b/deal.II/doc/tutorial/chapter-3.laplace/code/Makefile index 7fbd4d5906..637ab68aef 100644 --- a/deal.II/doc/tutorial/chapter-3.laplace/code/Makefile +++ b/deal.II/doc/tutorial/chapter-3.laplace/code/Makefile @@ -144,7 +144,7 @@ clean: #rather for libnumerics.a(tria.o) Makefile.dep: $(cc-files) $(h-files) $(lib-h-files) @echo ============================ Remaking Makefile - @perl $(root)/deal.II/Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ + @$(PERL) $(root)/deal.II/Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ > Makefile.dep diff --git a/deal.II/examples/step-1/Makefile b/deal.II/examples/step-1/Makefile index 9761232d00..dc63e10441 100644 --- a/deal.II/examples/step-1/Makefile +++ b/deal.II/examples/step-1/Makefile @@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) @echo ============================ Remaking Makefile - @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(target).cc \ - | perl -pi -e 's!lib/g?o/!!g;' \ + @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) $(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 dd721e4f44..4333ecdcb8 100644 --- a/deal.II/examples/step-10/Makefile +++ b/deal.II/examples/step-10/Makefile @@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) @echo ============================ Remaking Makefile - @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(target).cc \ - | perl -pi -e 's!lib/g?o/!!g;' \ + @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) $(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 c02ef0f148..2780e00497 100644 --- a/deal.II/examples/step-11/Makefile +++ b/deal.II/examples/step-11/Makefile @@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) @echo ============================ Remaking Makefile - @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(target).cc \ - | perl -pi -e 's!lib/g?o/!!g;' \ + @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) $(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 c02ef0f148..2780e00497 100644 --- a/deal.II/examples/step-12/Makefile +++ b/deal.II/examples/step-12/Makefile @@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) @echo ============================ Remaking Makefile - @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(target).cc \ - | perl -pi -e 's!lib/g?o/!!g;' \ + @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) $(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 c02ef0f148..2780e00497 100644 --- a/deal.II/examples/step-13/Makefile +++ b/deal.II/examples/step-13/Makefile @@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) @echo ============================ Remaking Makefile - @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(target).cc \ - | perl -pi -e 's!lib/g?o/!!g;' \ + @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) $(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 41b6eb1e89..0cd69ee81c 100644 --- a/deal.II/examples/step-2/Makefile +++ b/deal.II/examples/step-2/Makefile @@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) @echo ============================ Remaking Makefile - @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(target).cc \ - | perl -pi -e 's!lib/g?o/!!g;' \ + @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) $(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 c02ef0f148..2780e00497 100644 --- a/deal.II/examples/step-3/Makefile +++ b/deal.II/examples/step-3/Makefile @@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) @echo ============================ Remaking Makefile - @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(target).cc \ - | perl -pi -e 's!lib/g?o/!!g;' \ + @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) $(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 270d71c47d..30673b07b8 100644 --- a/deal.II/examples/step-4/Makefile +++ b/deal.II/examples/step-4/Makefile @@ -150,8 +150,8 @@ Makefile.dep: $(target).cc Makefile \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) @echo ============================ Remaking Makefile - @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(target).cc \ - | perl -pi -e 's!lib/g?o/!!g;' \ + @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) $(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 c02ef0f148..2780e00497 100644 --- a/deal.II/examples/step-5/Makefile +++ b/deal.II/examples/step-5/Makefile @@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) @echo ============================ Remaking Makefile - @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(target).cc \ - | perl -pi -e 's!lib/g?o/!!g;' \ + @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) $(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 c02ef0f148..2780e00497 100644 --- a/deal.II/examples/step-6/Makefile +++ b/deal.II/examples/step-6/Makefile @@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) @echo ============================ Remaking Makefile - @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(target).cc \ - | perl -pi -e 's!lib/g?o/!!g;' \ + @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) $(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 6360bcca20..84a2408be8 100644 --- a/deal.II/examples/step-7/Makefile +++ b/deal.II/examples/step-7/Makefile @@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) @echo ============================ Remaking Makefile - @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(target).cc \ - | perl -pi -e 's!lib/g?o/!!g;' \ + @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) $(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 c02ef0f148..2780e00497 100644 --- a/deal.II/examples/step-8/Makefile +++ b/deal.II/examples/step-8/Makefile @@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) @echo ============================ Remaking Makefile - @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(target).cc \ - | perl -pi -e 's!lib/g?o/!!g;' \ + @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) $(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 c02ef0f148..2780e00497 100644 --- a/deal.II/examples/step-9/Makefile +++ b/deal.II/examples/step-9/Makefile @@ -148,8 +148,8 @@ Makefile.dep: $(target).cc Makefile \ $(include-path-lac)/lac/*.h \ $(include-path-deal2)/*/*.h) @echo ============================ Remaking Makefile - @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(target).cc \ - | perl -pi -e 's!lib/g?o/!!g;' \ + @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) $(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