Blow away Makefile.dep if it was created but is empty. This usually indicates a probl...

git-svn-id: https://svn.dealii.org/trunk@9691 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/base/Makefile b/deal.II/base/Makefile
index e49356fd6dddeee72f63f159400a6e17625b620c..d3e979d62825116da63311b1490b449cf0eee4cc 100644 (file)
--- a/deal.II/base/Makefile
+++ b/deal.II/base/Makefile
@@ -70,15 +70,21 @@ clean:
        -rm -f *~ include/*~ include/*/*~ Makefile.dep
 
 
-#Rule to generate the dependency file. This file is
-#automagically remade whenever needed, i.e. whenever
-#one of the cc-/h-files changed. Make detects whether
-#to remake this file upon inclusion at the bottom
-#of this file.
+# Rule to generate the dependency file. This file is
+# automagically remade whenever needed, i.e. whenever
+# one of the cc-/h-files changed. Make detects whether
+# to remake this file upon inclusion at the bottom
+# of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(cc-files) $(h-files) Makefile $D/common/Make.global_options
        @echo ============================ Remaking base/Makefile
        @$D/common/scripts/make_dependencies $(INCLUDE) "-B$(LIBDIR)/base" $(cc-files) \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 
 # include all the dependencies

diff --git a/deal.II/contrib/hsl/Makefile b/deal.II/contrib/hsl/Makefile
index 993ba83d454c2e669c2e2885d3d89786e6839228..6b483d9907a556e8b22ab9fb42acbc7856d5b7c9 100644 (file)
--- a/deal.II/contrib/hsl/Makefile
+++ b/deal.II/contrib/hsl/Makefile
@@ -1,5 +1,5 @@
 # $Id$
-# Copyright (C) 2001, 2002, 2003 by Wolfgang Bangerth
+# Copyright (C) 2001, 2002, 2003, 2004 by Wolfgang Bangerth
 
 
 D = ../..
@@ -67,6 +67,10 @@ clean:
 # of this file.
 #
 # note that we take care if there are no f-files
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(f-files) Makefile
        @echo ============================ Remaking Makefile
        @(if test "x$(f-files)" != "x" ; then \
@@ -75,6 +79,7 @@ Makefile.dep: $(f-files) Makefile
            done ; \
           fi) \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
 
 
 # include all the dependencies

diff --git a/deal.II/deal.II/Makefile b/deal.II/deal.II/Makefile
index e1d8ad4e76e55fda27002cfe885e5e2de2c5f09c..4323b974b5e3a9ce819706be965d368d5269c49d 100644 (file)
--- a/deal.II/deal.II/Makefile
+++ b/deal.II/deal.II/Makefile
@@ -162,11 +162,15 @@ $(LIBDIR)/libdeal_II_3d.so: $(o-files-3d)
 
 
 
-#Rule to generate the dependency file. This file is
-#automagically remade whenever needed, i.e. whenever
-#one of the cc-/h-files changed. Make detects whether
-#to remake this file upon inclusion at the bottom
-#of this file.
+# Rule to generate the dependency file. This file is
+# automagically remade whenever needed, i.e. whenever
+# one of the cc-/h-files changed. Make detects whether
+# to remake this file upon inclusion at the bottom
+# of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(cc-files) $(h-files) Makefile $D/common/Make.global_options
        @echo "============================ Remaking deal.II/Makefile"
        @$D/common/scripts/make_dependencies $(INCLUDE) "-B\$$(LIBDIR)" $(cc-files) \
@@ -174,6 +178,8 @@ Makefile.dep: $(cc-files) $(h-files) Makefile $D/common/Make.global_options
                | $(PERL) -pe 's!((\.g)?.$(OBJEXT)):!_DIM_PLACEHOLDER$$1:!g;' \
                | $(PERL) -pe 's!^(.*)/DIM_PLACEHOLDER/(.*)_DIM_PLACEHOLDER(\..*):!$$1/1d/$$2_1d$$3 $$1/2d/$$2_2d$$3 $$1/3d/$$2_3d$$3:!g;'\
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # include all the dependencies
 include Makefile.dep

diff --git a/deal.II/examples/step-1/Makefile b/deal.II/examples/step-1/Makefile
index 8154cc65457d8871980fe4101740cbcbd6407cbd..910356c898c4405733d8e2996e89245bc3790dcc 100644 (file)
--- a/deal.II/examples/step-1/Makefile
+++ b/deal.II/examples/step-1/Makefile
@@ -136,11 +136,17 @@ clean:
 # the executable. This file is automagically remade whenever needed,
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(target).cc Makefile \
               $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # To make the dependencies known to `make', we finally have to include
 # them:

diff --git a/deal.II/examples/step-10/Makefile b/deal.II/examples/step-10/Makefile
index b539fcc427aaf0ab4c4d037971289600f00abded..8350f949751c54e4eedad1dda50c5dec6d911a1d 100644 (file)
--- a/deal.II/examples/step-10/Makefile
+++ b/deal.II/examples/step-10/Makefile
@@ -136,11 +136,17 @@ clean:
 # the executable. This file is automagically remade whenever needed,
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(target).cc Makefile \
               $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # To make the dependencies known to `make', we finally have to include
 # them:

diff --git a/deal.II/examples/step-11/Makefile b/deal.II/examples/step-11/Makefile
index 8154cc65457d8871980fe4101740cbcbd6407cbd..910356c898c4405733d8e2996e89245bc3790dcc 100644 (file)
--- a/deal.II/examples/step-11/Makefile
+++ b/deal.II/examples/step-11/Makefile
@@ -136,11 +136,17 @@ clean:
 # the executable. This file is automagically remade whenever needed,
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(target).cc Makefile \
               $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # To make the dependencies known to `make', we finally have to include
 # them:

diff --git a/deal.II/examples/step-12/Makefile b/deal.II/examples/step-12/Makefile
index 8154cc65457d8871980fe4101740cbcbd6407cbd..910356c898c4405733d8e2996e89245bc3790dcc 100644 (file)
--- a/deal.II/examples/step-12/Makefile
+++ b/deal.II/examples/step-12/Makefile
@@ -136,11 +136,17 @@ clean:
 # the executable. This file is automagically remade whenever needed,
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(target).cc Makefile \
               $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # To make the dependencies known to `make', we finally have to include
 # them:

diff --git a/deal.II/examples/step-13/Makefile b/deal.II/examples/step-13/Makefile
index 8154cc65457d8871980fe4101740cbcbd6407cbd..910356c898c4405733d8e2996e89245bc3790dcc 100644 (file)
--- a/deal.II/examples/step-13/Makefile
+++ b/deal.II/examples/step-13/Makefile
@@ -136,11 +136,17 @@ clean:
 # the executable. This file is automagically remade whenever needed,
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(target).cc Makefile \
               $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # To make the dependencies known to `make', we finally have to include
 # them:

diff --git a/deal.II/examples/step-14/Makefile b/deal.II/examples/step-14/Makefile
index 8154cc65457d8871980fe4101740cbcbd6407cbd..910356c898c4405733d8e2996e89245bc3790dcc 100644 (file)
--- a/deal.II/examples/step-14/Makefile
+++ b/deal.II/examples/step-14/Makefile
@@ -136,11 +136,17 @@ clean:
 # the executable. This file is automagically remade whenever needed,
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(target).cc Makefile \
               $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # To make the dependencies known to `make', we finally have to include
 # them:

diff --git a/deal.II/examples/step-15/Makefile b/deal.II/examples/step-15/Makefile
index aebe1cd809f366937417e5e2af17fae8ec3e8e28..749b9276bfbb031c86931813d29475828619662d 100644 (file)
--- a/deal.II/examples/step-15/Makefile
+++ b/deal.II/examples/step-15/Makefile
@@ -136,11 +136,17 @@ clean:
 # the executable. This file is automagically remade whenever needed,
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(target).cc Makefile \
               $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # To make the dependencies known to `make', we finally have to include
 # them:

diff --git a/deal.II/examples/step-16/Makefile b/deal.II/examples/step-16/Makefile
index 6038d092ade78d7def7ed698cf3ad419b2dd2047..fac1a71a831b2c416c129f5bdfffbc652c39d3de 100644 (file)
--- a/deal.II/examples/step-16/Makefile
+++ b/deal.II/examples/step-16/Makefile
@@ -135,11 +135,17 @@ clean:
 # the executable. This file is automagically remade whenever needed,
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(target).cc Makefile \
               $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # To make the dependencies known to `make', we finally have to include
 # them:

diff --git a/deal.II/examples/step-17/Makefile b/deal.II/examples/step-17/Makefile
index 8a0690f41c3dc3f5adc13f0a9defcb50e67da023..f74a8d921c8caea5ee0cc44b4e7868b28c8118e3 100644 (file)
--- a/deal.II/examples/step-17/Makefile
+++ b/deal.II/examples/step-17/Makefile
@@ -155,11 +155,17 @@ clean:
 # the executable. This file is automagically remade whenever needed,
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(target).cc Makefile \
               $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # To make the dependencies known to `make', we finally have to include
 # them:

diff --git a/deal.II/examples/step-2/Makefile b/deal.II/examples/step-2/Makefile
index dfa815e67a0dd616d8f0b66b52349ee413bc1293..dbd6066cb6f0abf3840a6e0fa8f0e217a6ddb89b 100644 (file)
--- a/deal.II/examples/step-2/Makefile
+++ b/deal.II/examples/step-2/Makefile
@@ -136,11 +136,17 @@ clean:
 # the executable. This file is automagically remade whenever needed,
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(target).cc Makefile \
               $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # To make the dependencies known to `make', we finally have to include
 # them:

diff --git a/deal.II/examples/step-3/Makefile b/deal.II/examples/step-3/Makefile
index 8154cc65457d8871980fe4101740cbcbd6407cbd..910356c898c4405733d8e2996e89245bc3790dcc 100644 (file)
--- a/deal.II/examples/step-3/Makefile
+++ b/deal.II/examples/step-3/Makefile
@@ -136,11 +136,17 @@ clean:
 # the executable. This file is automagically remade whenever needed,
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(target).cc Makefile \
               $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # To make the dependencies known to `make', we finally have to include
 # them:

diff --git a/deal.II/examples/step-4/Makefile b/deal.II/examples/step-4/Makefile
index f12f835d33e7071c69d21a7316ea1fb6046d73ce..ba429f5d42726e4fdd0721ab48c12f3b8d9aeda4 100644 (file)
--- a/deal.II/examples/step-4/Makefile
+++ b/deal.II/examples/step-4/Makefile
@@ -138,11 +138,17 @@ clean:
 # the executable. This file is automagically remade whenever needed,
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(target).cc Makefile \
               $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # To make the dependencies known to `make', we finally have to include
 # them:

diff --git a/deal.II/examples/step-5/Makefile b/deal.II/examples/step-5/Makefile
index 8154cc65457d8871980fe4101740cbcbd6407cbd..910356c898c4405733d8e2996e89245bc3790dcc 100644 (file)
--- a/deal.II/examples/step-5/Makefile
+++ b/deal.II/examples/step-5/Makefile
@@ -136,11 +136,17 @@ clean:
 # the executable. This file is automagically remade whenever needed,
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(target).cc Makefile \
               $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # To make the dependencies known to `make', we finally have to include
 # them:

diff --git a/deal.II/examples/step-6/Makefile b/deal.II/examples/step-6/Makefile
index 8154cc65457d8871980fe4101740cbcbd6407cbd..910356c898c4405733d8e2996e89245bc3790dcc 100644 (file)
--- a/deal.II/examples/step-6/Makefile
+++ b/deal.II/examples/step-6/Makefile
@@ -136,11 +136,17 @@ clean:
 # the executable. This file is automagically remade whenever needed,
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(target).cc Makefile \
               $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # To make the dependencies known to `make', we finally have to include
 # them:

diff --git a/deal.II/examples/step-7/Makefile b/deal.II/examples/step-7/Makefile
index 3b93e6e3e546838c23da73133c724a81e5280cd5..f9b252c42f26aa49591e2beac20b443d0a856d19 100644 (file)
--- a/deal.II/examples/step-7/Makefile
+++ b/deal.II/examples/step-7/Makefile
@@ -136,11 +136,17 @@ clean:
 # the executable. This file is automagically remade whenever needed,
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(target).cc Makefile \
               $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # To make the dependencies known to `make', we finally have to include
 # them:

diff --git a/deal.II/examples/step-8/Makefile b/deal.II/examples/step-8/Makefile
index 8154cc65457d8871980fe4101740cbcbd6407cbd..910356c898c4405733d8e2996e89245bc3790dcc 100644 (file)
--- a/deal.II/examples/step-8/Makefile
+++ b/deal.II/examples/step-8/Makefile
@@ -136,11 +136,17 @@ clean:
 # the executable. This file is automagically remade whenever needed,
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(target).cc Makefile \
               $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # To make the dependencies known to `make', we finally have to include
 # them:

diff --git a/deal.II/examples/step-9/Makefile b/deal.II/examples/step-9/Makefile
index 8154cc65457d8871980fe4101740cbcbd6407cbd..910356c898c4405733d8e2996e89245bc3790dcc 100644 (file)
--- a/deal.II/examples/step-9/Makefile
+++ b/deal.II/examples/step-9/Makefile
@@ -136,11 +136,17 @@ clean:
 # the executable. This file is automagically remade whenever needed,
 # i.e. whenever one of the cc-/h-files changed. Make detects whether
 # to remake this file upon inclusion at the bottom of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(target).cc Makefile \
               $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # To make the dependencies known to `make', we finally have to include
 # them:

diff --git a/deal.II/lac/Makefile b/deal.II/lac/Makefile
index 0e614ae912d1a32e69bdda213ad985c5e08a41c6..e037e2326948631b91d1a53301e1b5cf1c0da060 100644 (file)
--- a/deal.II/lac/Makefile
+++ b/deal.II/lac/Makefile
@@ -95,15 +95,21 @@ clean:
        -rm -f *~ include/*~ include/*/*~ Makefile.dep
 
 
-#Rule to generate the dependency file. This file is
-#automagically remade whenever needed, i.e. whenever
-#one of the cc-/h-files changed. Make detects whether
-#to remake this file upon inclusion at the bottom
-#of this file.
+# Rule to generate the dependency file. This file is
+# automagically remade whenever needed, i.e. whenever
+# one of the cc-/h-files changed. Make detects whether
+# to remake this file upon inclusion at the bottom
+# of this file.
+#
+# If the file should turn out to be empty, then blow it
+# away to let make issue a proper error message rather than
+# some obscure follow-up problems
 Makefile.dep: $(cc-files) $(h-files) Makefile $D/common/Make.global_options
        @echo ============================ Remaking lac/Makefile
        @$D/common/scripts/make_dependencies $(INCLUDE) "-B$(LIBDIR)/lac" $(cc-files) \
                > Makefile.dep
+       @if test -s $@ ; then : else rm $@ ; fi
+
 
 # include all the dependencies
 include Makefile.dep