]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Move the Makefile snippet to generate the dependencies to the /common directory.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 10 Aug 1999 15:52:57 +0000 (15:52 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 10 Aug 1999 15:52:57 +0000 (15:52 +0000)
git-svn-id: https://svn.dealii.org/trunk@1672 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/base/source/Makefile
deal.II/deal.II/Make.forward-declarations [deleted file]
deal.II/deal.II/source/Makefile
deal.II/lac/source/Makefile

index 6cc653780152f3513cb0423bee71e8e318bd3788..71d8e1b1e37363792ddd3431d134f27588cc552e 100644 (file)
@@ -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 (file)
index daea0cf..0000000
+++ /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
index d0b21e1e7f63a05ac329776dad22426034b19b9c..98ef5a8a193a950252d7796ccafeed96d65f051b 100644 (file)
@@ -186,5 +186,6 @@ endif
 
 include ../lib/Makefile.dep
 
-include $D/deal.II/Make.forward-declarations
+include $D/common/Makescripts/forward_declarations
+
 
index d921a3f1e25d1c653394e27e043c411de888e034..32f5ee39ad0102e8ed317c9b591fb1064f48b052 100644 (file)
@@ -62,4 +62,5 @@ endif
 
 include ../lib/Makefile.dep
 
-include $D/deal.II/Make.forward-declarations
+include $D/common/Makescripts/forward_declarations
+

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.