From: wolf Date: Tue, 10 Aug 1999 15:52:57 +0000 (+0000) Subject: Move the Makefile snippet to generate the dependencies to the /common directory. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5ba9bcf0053be98aee05d2ce52d4c52fef96789;p=dealii-svn.git Move the Makefile snippet to generate the dependencies to the /common directory. git-svn-id: https://svn.dealii.org/trunk@1672 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/source/Makefile b/deal.II/base/source/Makefile index 6cc6537801..71d8e1b1e3 100644 --- a/deal.II/base/source/Makefile +++ b/deal.II/base/source/Makefile @@ -98,4 +98,4 @@ endif include ../lib/Makefile.dep -include $D/deal.II/Make.forward-declarations +include $D/common/Makescripts/forward_declarations diff --git a/deal.II/deal.II/Make.forward-declarations b/deal.II/deal.II/Make.forward-declarations deleted file mode 100644 index daea0cfa65..0000000000 --- a/deal.II/deal.II/Make.forward-declarations +++ /dev/null @@ -1,43 +0,0 @@ -# rule how to make the file containing all the forward declarations -# taken from the deal.II Makefile -# -# this rule is rather complicated, it works as follows: -# -# - if this is the outermost 'make', then create a file $@.old. -# if the forward declaration file $@ already exists, then copy -# it over, otherwise leave it empty. this way, we always have -# a file to run diff on. send the output of the copy command -# (which may fail) to nirvana. -# - write the forward declarations for the presently available -# header files to $@.new -# - we would like to compare the output of the script generating -# the forward declarations with the old file, or the empty -# string if there is no such file; this is why we created $@.old -# - if the files differ, we would like to copy over the old file. -# - this can either be done using shell programming using 'if [...]' -# or using conditionals inside 'make'. the first way is not -# portable over different shells, however, and I also do not know -# how to write it. the second way has a problem also: conditionals -# are evaluated at the time the Makefile is read first, so we -# can't compare against $@.old, since this file does not exist at -# that time. -# - we therefore invoke a second 'make', which can compare the two -# files against each other in a preconditional clause and -# copy over the file if necessary. -# - delete the two temporary files -$(forward-declarations): $(filter-out %forward-declarations%,$(h-files)) -ifneq (1,${recursive-make-fwd-decl}) - @echo ============================ Checking $@ - @touch $@.old - -@cp $@ $@.old > /dev/null 2>&1 - @perl $D/common/scripts/Make_forward_declarations.pl $(filter-out %forward-declarations.h,$(h-files)) > $@.new - @make --silent recursive-make-fwd-decl=1 $@ - @rm $@.old $@.new -else - ifneq (,$(shell diff $(forward-declarations).old $(forward-declarations).new)) - @echo ============================ Generating $@ - @cp $@.new $@ - else - @echo "============================ $@ needs no change" - endif -endif diff --git a/deal.II/deal.II/source/Makefile b/deal.II/deal.II/source/Makefile index d0b21e1e7f..98ef5a8a19 100644 --- a/deal.II/deal.II/source/Makefile +++ b/deal.II/deal.II/source/Makefile @@ -186,5 +186,6 @@ endif include ../lib/Makefile.dep -include $D/deal.II/Make.forward-declarations +include $D/common/Makescripts/forward_declarations + diff --git a/deal.II/lac/source/Makefile b/deal.II/lac/source/Makefile index d921a3f1e2..32f5ee39ad 100644 --- a/deal.II/lac/source/Makefile +++ b/deal.II/lac/source/Makefile @@ -62,4 +62,5 @@ endif include ../lib/Makefile.dep -include $D/deal.II/Make.forward-declarations +include $D/common/Makescripts/forward_declarations +