From abe304fb81130906f40f2a44e552a228c498d5fd Mon Sep 17 00:00:00 2001 From: cvs Date: Thu, 14 Oct 1999 17:23:36 +0000 Subject: [PATCH] Fix some of the problems introduced with gmake 3.77. git-svn-id: https://svn.dealii.org/trunk@1770 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/Attic/examples/convergence/Makefile | 6 +++--- deal.II/deal.II/Attic/examples/dof/Makefile | 6 +++--- deal.II/deal.II/Attic/examples/error-estimation/Makefile | 6 +++--- deal.II/deal.II/Attic/examples/grid/Makefile | 6 +++--- deal.II/deal.II/Attic/examples/multigrid/Makefile | 6 +++--- .../Attic/examples/nonlinear/fixed-point-iteration/Makefile | 6 +++--- deal.II/deal.II/Attic/examples/poisson/Makefile | 6 +++--- tests/big-tests/convergence/Makefile | 6 +++--- tests/big-tests/dof/Makefile | 6 +++--- tests/big-tests/error-estimation/Makefile | 6 +++--- tests/big-tests/grid/Makefile | 6 +++--- tests/big-tests/multigrid/Makefile | 6 +++--- tests/big-tests/nonlinear/fixed-point-iteration/Makefile | 6 +++--- tests/big-tests/poisson/Makefile | 6 +++--- 14 files changed, 42 insertions(+), 42 deletions(-) diff --git a/deal.II/deal.II/Attic/examples/convergence/Makefile b/deal.II/deal.II/Attic/examples/convergence/Makefile index ea06a20f1e..937c664669 100644 --- a/deal.II/deal.II/Attic/examples/convergence/Makefile +++ b/deal.II/deal.II/Attic/examples/convergence/Makefile @@ -42,11 +42,11 @@ D = ../../.. include $D/common/Make.global_options # get lists of files we need -cc-files = $(wildcard *.cc) +cc-files = $(filter-out *%, $(shell echo *.cc)) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) -h-files = $(wildcard *.h) -lib-h-files = $(wildcard ../../include/*/*.h) +h-files = $(filter-out *%, $(shell echo *.h)) +lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with libs = ./Obj.a -ldeal_II_2d -llac -lbase diff --git a/deal.II/deal.II/Attic/examples/dof/Makefile b/deal.II/deal.II/Attic/examples/dof/Makefile index aaa7309369..46b8df97c3 100644 --- a/deal.II/deal.II/Attic/examples/dof/Makefile +++ b/deal.II/deal.II/Attic/examples/dof/Makefile @@ -43,11 +43,11 @@ include $D/common/Make.global_options # get lists of files we need -cc-files = $(wildcard *.cc) +cc-files = $(filter-out *%, $(shell echo *.cc)) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) -h-files = $(wildcard *.h) -lib-h-files = $(wildcard ../../include/*/*.h) +h-files = $(filter-out *%, $(shell echo *.h)) +lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with libs = ./Obj.a ../../lib/libdeal_II_2d.a ../../lib/libdeal_II_3d.a ../../../lac/lib/liblac.a ../../../base/lib/libbase.a diff --git a/deal.II/deal.II/Attic/examples/error-estimation/Makefile b/deal.II/deal.II/Attic/examples/error-estimation/Makefile index 28a3caf507..180aa8b7a3 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/Makefile +++ b/deal.II/deal.II/Attic/examples/error-estimation/Makefile @@ -48,11 +48,11 @@ include $D/common/Make.global_options # get lists of files we need -cc-files = $(wildcard *.cc) +cc-files = $(filter-out *%, $(shell echo *.cc)) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) -h-files = $(wildcard *.h) -lib-h-files = $(wildcard ../../include/*/*.h) +h-files = $(filter-out *%, $(shell echo *.h)) +lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with libs = ./Obj.a -ldeal_II_2d -llac -lbase diff --git a/deal.II/deal.II/Attic/examples/grid/Makefile b/deal.II/deal.II/Attic/examples/grid/Makefile index feb050c656..1be0febb07 100644 --- a/deal.II/deal.II/Attic/examples/grid/Makefile +++ b/deal.II/deal.II/Attic/examples/grid/Makefile @@ -43,11 +43,11 @@ include $D/common/Make.global_options # get lists of files we need -cc-files = $(wildcard *.cc) +cc-files = $(filter-out *%, $(shell echo *.cc)) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) -h-files = $(wildcard *.h) -lib-h-files = $(wildcard ../../include/*/*.h) +h-files = $(filter-out *%, $(shell echo *.h)) +lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with libs = ./Obj.a ../../lib/libdeal_II_2d.g.a ../../lib/libdeal_II_3d.a ../../../lac/lib/liblac.a ../../../base/lib/libbase.a diff --git a/deal.II/deal.II/Attic/examples/multigrid/Makefile b/deal.II/deal.II/Attic/examples/multigrid/Makefile index 478f866bf1..63557adbdc 100644 --- a/deal.II/deal.II/Attic/examples/multigrid/Makefile +++ b/deal.II/deal.II/Attic/examples/multigrid/Makefile @@ -43,11 +43,11 @@ include $D/common/Make.global_options # get lists of files we need -cc-files = $(wildcard *.cc) +cc-files = $(filter-out *%, $(shell echo *.cc)) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) -h-files = $(wildcard *.h) -lib-h-files = $(wildcard ../../include/*/*.h) +h-files = $(filter-out *%, $(shell echo *.h)) +lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with libs = ./Obj.a -ldeal_II_2d -llac -lbase diff --git a/deal.II/deal.II/Attic/examples/nonlinear/fixed-point-iteration/Makefile b/deal.II/deal.II/Attic/examples/nonlinear/fixed-point-iteration/Makefile index 1572542e20..a3e05a8b1a 100644 --- a/deal.II/deal.II/Attic/examples/nonlinear/fixed-point-iteration/Makefile +++ b/deal.II/deal.II/Attic/examples/nonlinear/fixed-point-iteration/Makefile @@ -44,11 +44,11 @@ include ../../../Make.global_options # get lists of files we need -cc-files = $(wildcard *.cc) +cc-files = $(filter-out *%, $(shell echo *.cc)) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) -h-files = $(wildcard *.h) -lib-h-files = $(wildcard ../../include/*/*.h) +h-files = $(filter-out *%, $(shell echo *.h)) +lib-h-files = $(filter-out *%, $(shell echo ../../include/*.h)) # list of libraries needed to link with libs = ./Obj.a -ldeal_II_2d -llac -lbase diff --git a/deal.II/deal.II/Attic/examples/poisson/Makefile b/deal.II/deal.II/Attic/examples/poisson/Makefile index bd62f51ff2..65a6d65624 100644 --- a/deal.II/deal.II/Attic/examples/poisson/Makefile +++ b/deal.II/deal.II/Attic/examples/poisson/Makefile @@ -44,11 +44,11 @@ include $D/common/Make.global_options # get lists of files we need -cc-files = $(wildcard *.cc) +cc-files = $(filter-out *%, $(shell echo *.cc)) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) -h-files = $(wildcard *.h) -lib-h-files = $(wildcard ../../include/*/*.h) +h-files = $(filter-out *%, $(shell echo *.h)) +lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with libs = ./Obj.a -ldeal_II_2d -llac -lbase diff --git a/tests/big-tests/convergence/Makefile b/tests/big-tests/convergence/Makefile index ea06a20f1e..937c664669 100644 --- a/tests/big-tests/convergence/Makefile +++ b/tests/big-tests/convergence/Makefile @@ -42,11 +42,11 @@ D = ../../.. include $D/common/Make.global_options # get lists of files we need -cc-files = $(wildcard *.cc) +cc-files = $(filter-out *%, $(shell echo *.cc)) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) -h-files = $(wildcard *.h) -lib-h-files = $(wildcard ../../include/*/*.h) +h-files = $(filter-out *%, $(shell echo *.h)) +lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with libs = ./Obj.a -ldeal_II_2d -llac -lbase diff --git a/tests/big-tests/dof/Makefile b/tests/big-tests/dof/Makefile index aaa7309369..46b8df97c3 100644 --- a/tests/big-tests/dof/Makefile +++ b/tests/big-tests/dof/Makefile @@ -43,11 +43,11 @@ include $D/common/Make.global_options # get lists of files we need -cc-files = $(wildcard *.cc) +cc-files = $(filter-out *%, $(shell echo *.cc)) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) -h-files = $(wildcard *.h) -lib-h-files = $(wildcard ../../include/*/*.h) +h-files = $(filter-out *%, $(shell echo *.h)) +lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with libs = ./Obj.a ../../lib/libdeal_II_2d.a ../../lib/libdeal_II_3d.a ../../../lac/lib/liblac.a ../../../base/lib/libbase.a diff --git a/tests/big-tests/error-estimation/Makefile b/tests/big-tests/error-estimation/Makefile index 28a3caf507..180aa8b7a3 100644 --- a/tests/big-tests/error-estimation/Makefile +++ b/tests/big-tests/error-estimation/Makefile @@ -48,11 +48,11 @@ include $D/common/Make.global_options # get lists of files we need -cc-files = $(wildcard *.cc) +cc-files = $(filter-out *%, $(shell echo *.cc)) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) -h-files = $(wildcard *.h) -lib-h-files = $(wildcard ../../include/*/*.h) +h-files = $(filter-out *%, $(shell echo *.h)) +lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with libs = ./Obj.a -ldeal_II_2d -llac -lbase diff --git a/tests/big-tests/grid/Makefile b/tests/big-tests/grid/Makefile index feb050c656..1be0febb07 100644 --- a/tests/big-tests/grid/Makefile +++ b/tests/big-tests/grid/Makefile @@ -43,11 +43,11 @@ include $D/common/Make.global_options # get lists of files we need -cc-files = $(wildcard *.cc) +cc-files = $(filter-out *%, $(shell echo *.cc)) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) -h-files = $(wildcard *.h) -lib-h-files = $(wildcard ../../include/*/*.h) +h-files = $(filter-out *%, $(shell echo *.h)) +lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with libs = ./Obj.a ../../lib/libdeal_II_2d.g.a ../../lib/libdeal_II_3d.a ../../../lac/lib/liblac.a ../../../base/lib/libbase.a diff --git a/tests/big-tests/multigrid/Makefile b/tests/big-tests/multigrid/Makefile index 478f866bf1..63557adbdc 100644 --- a/tests/big-tests/multigrid/Makefile +++ b/tests/big-tests/multigrid/Makefile @@ -43,11 +43,11 @@ include $D/common/Make.global_options # get lists of files we need -cc-files = $(wildcard *.cc) +cc-files = $(filter-out *%, $(shell echo *.cc)) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) -h-files = $(wildcard *.h) -lib-h-files = $(wildcard ../../include/*/*.h) +h-files = $(filter-out *%, $(shell echo *.h)) +lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with libs = ./Obj.a -ldeal_II_2d -llac -lbase diff --git a/tests/big-tests/nonlinear/fixed-point-iteration/Makefile b/tests/big-tests/nonlinear/fixed-point-iteration/Makefile index 1572542e20..a3e05a8b1a 100644 --- a/tests/big-tests/nonlinear/fixed-point-iteration/Makefile +++ b/tests/big-tests/nonlinear/fixed-point-iteration/Makefile @@ -44,11 +44,11 @@ include ../../../Make.global_options # get lists of files we need -cc-files = $(wildcard *.cc) +cc-files = $(filter-out *%, $(shell echo *.cc)) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) -h-files = $(wildcard *.h) -lib-h-files = $(wildcard ../../include/*/*.h) +h-files = $(filter-out *%, $(shell echo *.h)) +lib-h-files = $(filter-out *%, $(shell echo ../../include/*.h)) # list of libraries needed to link with libs = ./Obj.a -ldeal_II_2d -llac -lbase diff --git a/tests/big-tests/poisson/Makefile b/tests/big-tests/poisson/Makefile index bd62f51ff2..65a6d65624 100644 --- a/tests/big-tests/poisson/Makefile +++ b/tests/big-tests/poisson/Makefile @@ -44,11 +44,11 @@ include $D/common/Make.global_options # get lists of files we need -cc-files = $(wildcard *.cc) +cc-files = $(filter-out *%, $(shell echo *.cc)) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) -h-files = $(wildcard *.h) -lib-h-files = $(wildcard ../../include/*/*.h) +h-files = $(filter-out *%, $(shell echo *.h)) +lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with libs = ./Obj.a -ldeal_II_2d -llac -lbase -- 2.39.5