From e8b9d490d7d60bf79b4ae0fd256b585479e0465e Mon Sep 17 00:00:00 2001 From: wolf Date: Thu, 12 Aug 1999 12:42:28 +0000 Subject: [PATCH] Adapt Makefiles to moved or renamed files. git-svn-id: https://svn.dealii.org/trunk@1685 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/Attic/examples/convergence/Makefile | 4 ++-- deal.II/deal.II/Attic/examples/dof/Makefile | 7 ++++--- deal.II/deal.II/Attic/examples/error-estimation/Makefile | 4 ++-- deal.II/deal.II/Attic/examples/grid/Makefile | 7 ++++--- deal.II/deal.II/Attic/examples/multigrid/Makefile | 4 ++-- deal.II/deal.II/Attic/examples/poisson/Makefile | 4 ++-- tests/big-tests/convergence/Makefile | 4 ++-- tests/big-tests/dof/Makefile | 7 ++++--- tests/big-tests/error-estimation/Makefile | 4 ++-- tests/big-tests/grid/Makefile | 7 ++++--- tests/big-tests/multigrid/Makefile | 4 ++-- tests/big-tests/poisson/Makefile | 4 ++-- 12 files changed, 32 insertions(+), 28 deletions(-) diff --git a/deal.II/deal.II/Attic/examples/convergence/Makefile b/deal.II/deal.II/Attic/examples/convergence/Makefile index 84c4f819e2..ea06a20f1e 100644 --- a/deal.II/deal.II/Attic/examples/convergence/Makefile +++ b/deal.II/deal.II/Attic/examples/convergence/Makefile @@ -39,7 +39,7 @@ delete-files = *gnuplot *.eps *ucd *history #deal include base path D = ../../.. -include $D/deal.II/Make.global_options +include $D/common/Make.global_options # get lists of files we need cc-files = $(wildcard *.cc) @@ -112,7 +112,7 @@ clean: #rather for libnumerics.a(tria.o) Makefile.dep: $(cc-files) $(h-files) $(lib-h-files) @echo ============================ Remaking Makefile - @perl ../../Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ + @perl $D/common/scripts/Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ > Makefile.dep diff --git a/deal.II/deal.II/Attic/examples/dof/Makefile b/deal.II/deal.II/Attic/examples/dof/Makefile index bc79a24a6e..aaa7309369 100644 --- a/deal.II/deal.II/Attic/examples/dof/Makefile +++ b/deal.II/deal.II/Attic/examples/dof/Makefile @@ -36,11 +36,12 @@ delete-files = results/?d.* ############################################################################### # Internals -include ../../Make.global_options - #deal include base path D = ../../.. +include $D/common/Make.global_options + + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -112,7 +113,7 @@ clean: #rather for libnumerics.a(tria.o) Makefile.dep: $(cc-files) $(h-files) $(lib-h-files) @echo ============================ Remaking Makefile - @perl ../../Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ + @perl $D/common/scripts/Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ > Makefile.dep diff --git a/deal.II/deal.II/Attic/examples/error-estimation/Makefile b/deal.II/deal.II/Attic/examples/error-estimation/Makefile index 5265b5d74e..28a3caf507 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/Makefile +++ b/deal.II/deal.II/Attic/examples/error-estimation/Makefile @@ -44,7 +44,7 @@ delete-files = data-*/* #deal include base path D = ../../.. -include ../../Make.global_options +include $D/common/Make.global_options # get lists of files we need @@ -114,7 +114,7 @@ clean: #rather for libnumerics.a(tria.o) Makefile.dep: $(cc-files) $(h-files) $(lib-h-files) @echo ============================ Remaking Makefile - @perl ../../Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ + @perl $D/common/scripts/Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ > Makefile.dep diff --git a/deal.II/deal.II/Attic/examples/grid/Makefile b/deal.II/deal.II/Attic/examples/grid/Makefile index e4b513f1b7..feb050c656 100644 --- a/deal.II/deal.II/Attic/examples/grid/Makefile +++ b/deal.II/deal.II/Attic/examples/grid/Makefile @@ -36,11 +36,12 @@ delete-files = results/[123]d* ############################################################################### # Internals -include ../../Make.global_options - #deal include base path D = ../../.. +include $D/common/Make.global_options + + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -112,7 +113,7 @@ clean: #rather for libnumerics.a(tria.o) Makefile.dep: $(cc-files) $(h-files) $(lib-h-files) @echo ============================ Remaking Makefile - @perl ../../Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ + @perl $D/common/scripts/Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ > Makefile.dep diff --git a/deal.II/deal.II/Attic/examples/multigrid/Makefile b/deal.II/deal.II/Attic/examples/multigrid/Makefile index 819d095459..478f866bf1 100644 --- a/deal.II/deal.II/Attic/examples/multigrid/Makefile +++ b/deal.II/deal.II/Attic/examples/multigrid/Makefile @@ -39,7 +39,7 @@ delete-files = *gnuplot *.eps *ucd *history #deal include base path D = ../../.. -include ../../Make.global_options +include $D/common/Make.global_options # get lists of files we need @@ -112,7 +112,7 @@ clean: #rather for libnumerics.a(tria.o) Makefile.dep: $(cc-files) $(h-files) $(lib-h-files) @echo ============================ Remaking Makefile - @perl ../../Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ + @perl $D/common/scripts/Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ > Makefile.dep diff --git a/deal.II/deal.II/Attic/examples/poisson/Makefile b/deal.II/deal.II/Attic/examples/poisson/Makefile index 5751836cc6..bd62f51ff2 100644 --- a/deal.II/deal.II/Attic/examples/poisson/Makefile +++ b/deal.II/deal.II/Attic/examples/poisson/Makefile @@ -39,7 +39,7 @@ delete-files = results/*gnuplot results/*.eps #deal include base path D = ../../.. -include ../../Make.global_options +include $D/common/Make.global_options @@ -114,7 +114,7 @@ clean: #rather for libnumerics.a(tria.o) Makefile.dep: $(cc-files) $(h-files) $(lib-h-files) @echo ============================ Remaking Makefile - @perl ../../Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ + @perl $D/common/scripts/Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ > Makefile.dep diff --git a/tests/big-tests/convergence/Makefile b/tests/big-tests/convergence/Makefile index 84c4f819e2..ea06a20f1e 100644 --- a/tests/big-tests/convergence/Makefile +++ b/tests/big-tests/convergence/Makefile @@ -39,7 +39,7 @@ delete-files = *gnuplot *.eps *ucd *history #deal include base path D = ../../.. -include $D/deal.II/Make.global_options +include $D/common/Make.global_options # get lists of files we need cc-files = $(wildcard *.cc) @@ -112,7 +112,7 @@ clean: #rather for libnumerics.a(tria.o) Makefile.dep: $(cc-files) $(h-files) $(lib-h-files) @echo ============================ Remaking Makefile - @perl ../../Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ + @perl $D/common/scripts/Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ > Makefile.dep diff --git a/tests/big-tests/dof/Makefile b/tests/big-tests/dof/Makefile index bc79a24a6e..aaa7309369 100644 --- a/tests/big-tests/dof/Makefile +++ b/tests/big-tests/dof/Makefile @@ -36,11 +36,12 @@ delete-files = results/?d.* ############################################################################### # Internals -include ../../Make.global_options - #deal include base path D = ../../.. +include $D/common/Make.global_options + + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -112,7 +113,7 @@ clean: #rather for libnumerics.a(tria.o) Makefile.dep: $(cc-files) $(h-files) $(lib-h-files) @echo ============================ Remaking Makefile - @perl ../../Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ + @perl $D/common/scripts/Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ > Makefile.dep diff --git a/tests/big-tests/error-estimation/Makefile b/tests/big-tests/error-estimation/Makefile index 5265b5d74e..28a3caf507 100644 --- a/tests/big-tests/error-estimation/Makefile +++ b/tests/big-tests/error-estimation/Makefile @@ -44,7 +44,7 @@ delete-files = data-*/* #deal include base path D = ../../.. -include ../../Make.global_options +include $D/common/Make.global_options # get lists of files we need @@ -114,7 +114,7 @@ clean: #rather for libnumerics.a(tria.o) Makefile.dep: $(cc-files) $(h-files) $(lib-h-files) @echo ============================ Remaking Makefile - @perl ../../Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ + @perl $D/common/scripts/Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ > Makefile.dep diff --git a/tests/big-tests/grid/Makefile b/tests/big-tests/grid/Makefile index e4b513f1b7..feb050c656 100644 --- a/tests/big-tests/grid/Makefile +++ b/tests/big-tests/grid/Makefile @@ -36,11 +36,12 @@ delete-files = results/[123]d* ############################################################################### # Internals -include ../../Make.global_options - #deal include base path D = ../../.. +include $D/common/Make.global_options + + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -112,7 +113,7 @@ clean: #rather for libnumerics.a(tria.o) Makefile.dep: $(cc-files) $(h-files) $(lib-h-files) @echo ============================ Remaking Makefile - @perl ../../Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ + @perl $D/common/scripts/Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ > Makefile.dep diff --git a/tests/big-tests/multigrid/Makefile b/tests/big-tests/multigrid/Makefile index 819d095459..478f866bf1 100644 --- a/tests/big-tests/multigrid/Makefile +++ b/tests/big-tests/multigrid/Makefile @@ -39,7 +39,7 @@ delete-files = *gnuplot *.eps *ucd *history #deal include base path D = ../../.. -include ../../Make.global_options +include $D/common/Make.global_options # get lists of files we need @@ -112,7 +112,7 @@ clean: #rather for libnumerics.a(tria.o) Makefile.dep: $(cc-files) $(h-files) $(lib-h-files) @echo ============================ Remaking Makefile - @perl ../../Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ + @perl $D/common/scripts/Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ > Makefile.dep diff --git a/tests/big-tests/poisson/Makefile b/tests/big-tests/poisson/Makefile index 5751836cc6..bd62f51ff2 100644 --- a/tests/big-tests/poisson/Makefile +++ b/tests/big-tests/poisson/Makefile @@ -39,7 +39,7 @@ delete-files = results/*gnuplot results/*.eps #deal include base path D = ../../.. -include ../../Make.global_options +include $D/common/Make.global_options @@ -114,7 +114,7 @@ clean: #rather for libnumerics.a(tria.o) Makefile.dep: $(cc-files) $(h-files) $(lib-h-files) @echo ============================ Remaking Makefile - @perl ../../Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ + @perl $D/common/scripts/Make_dep.pl ./Obj $(INCLUDE) $(cc-files) \ > Makefile.dep -- 2.39.5