Makefiles adapted

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

diff --git a/deal.II/examples/step-1/Makefile b/deal.II/examples/step-1/Makefile
index a92d87c2415c48044837c6672e8ca5efc83eb9cf..8154cc65457d8871980fe4101740cbcbd6407cbd 100644 (file)
--- a/deal.II/examples/step-1/Makefile
+++ b/deal.II/examples/step-1/Makefile
@@ -137,9 +137,7 @@ clean:
 # 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.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep

diff --git a/deal.II/examples/step-10/Makefile b/deal.II/examples/step-10/Makefile
index 2a6c2204313c25d504ba054140b9b1f980707e00..b539fcc427aaf0ab4c4d037971289600f00abded 100644 (file)
--- a/deal.II/examples/step-10/Makefile
+++ b/deal.II/examples/step-10/Makefile
@@ -137,9 +137,7 @@ clean:
 # 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.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep

diff --git a/deal.II/examples/step-11/Makefile b/deal.II/examples/step-11/Makefile
index a92d87c2415c48044837c6672e8ca5efc83eb9cf..8154cc65457d8871980fe4101740cbcbd6407cbd 100644 (file)
--- a/deal.II/examples/step-11/Makefile
+++ b/deal.II/examples/step-11/Makefile
@@ -137,9 +137,7 @@ clean:
 # 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.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep

diff --git a/deal.II/examples/step-12/Makefile b/deal.II/examples/step-12/Makefile
index a92d87c2415c48044837c6672e8ca5efc83eb9cf..8154cc65457d8871980fe4101740cbcbd6407cbd 100644 (file)
--- a/deal.II/examples/step-12/Makefile
+++ b/deal.II/examples/step-12/Makefile
@@ -137,9 +137,7 @@ clean:
 # 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.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep

diff --git a/deal.II/examples/step-13/Makefile b/deal.II/examples/step-13/Makefile
index a92d87c2415c48044837c6672e8ca5efc83eb9cf..8154cc65457d8871980fe4101740cbcbd6407cbd 100644 (file)
--- a/deal.II/examples/step-13/Makefile
+++ b/deal.II/examples/step-13/Makefile
@@ -137,9 +137,7 @@ clean:
 # 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.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep

diff --git a/deal.II/examples/step-14/Makefile b/deal.II/examples/step-14/Makefile
index a92d87c2415c48044837c6672e8ca5efc83eb9cf..8154cc65457d8871980fe4101740cbcbd6407cbd 100644 (file)
--- a/deal.II/examples/step-14/Makefile
+++ b/deal.II/examples/step-14/Makefile
@@ -137,9 +137,7 @@ clean:
 # 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.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep

diff --git a/deal.II/examples/step-15/Makefile b/deal.II/examples/step-15/Makefile
index 3a62635fac4c739fa2ffdeae5f0fcea7a25eda3c..aebe1cd809f366937417e5e2af17fae8ec3e8e28 100644 (file)
--- a/deal.II/examples/step-15/Makefile
+++ b/deal.II/examples/step-15/Makefile
@@ -137,9 +137,7 @@ clean:
 # 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.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep

diff --git a/deal.II/examples/step-16/Makefile b/deal.II/examples/step-16/Makefile
index dae158698b9557610c74b83bd5727f4731733202..6038d092ade78d7def7ed698cf3ad419b2dd2047 100644 (file)
--- a/deal.II/examples/step-16/Makefile
+++ b/deal.II/examples/step-16/Makefile
@@ -136,9 +136,7 @@ clean:
 # 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.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep

diff --git a/deal.II/examples/step-17/Makefile b/deal.II/examples/step-17/Makefile
index 2d7deb8ece57e3ad70648167bffe2b4c3aaf9fad..8a0690f41c3dc3f5adc13f0a9defcb50e67da023 100644 (file)
--- a/deal.II/examples/step-17/Makefile
+++ b/deal.II/examples/step-17/Makefile
@@ -156,9 +156,7 @@ clean:
 # 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.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep

diff --git a/deal.II/examples/step-2/Makefile b/deal.II/examples/step-2/Makefile
index fb2fbbb63853313f7783acfec32132a5e15bda0c..dfa815e67a0dd616d8f0b66b52349ee413bc1293 100644 (file)
--- a/deal.II/examples/step-2/Makefile
+++ b/deal.II/examples/step-2/Makefile
@@ -137,9 +137,7 @@ clean:
 # 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.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep

diff --git a/deal.II/examples/step-3/Makefile b/deal.II/examples/step-3/Makefile
index a92d87c2415c48044837c6672e8ca5efc83eb9cf..8154cc65457d8871980fe4101740cbcbd6407cbd 100644 (file)
--- a/deal.II/examples/step-3/Makefile
+++ b/deal.II/examples/step-3/Makefile
@@ -137,9 +137,7 @@ clean:
 # 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.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep

diff --git a/deal.II/examples/step-4/Makefile b/deal.II/examples/step-4/Makefile
index c176eb33ab1e46cb302dbe43666345f74cf7c6f5..f12f835d33e7071c69d21a7316ea1fb6046d73ce 100644 (file)
--- a/deal.II/examples/step-4/Makefile
+++ b/deal.II/examples/step-4/Makefile
@@ -139,9 +139,7 @@ clean:
 # 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.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep

diff --git a/deal.II/examples/step-5/Makefile b/deal.II/examples/step-5/Makefile
index a92d87c2415c48044837c6672e8ca5efc83eb9cf..8154cc65457d8871980fe4101740cbcbd6407cbd 100644 (file)
--- a/deal.II/examples/step-5/Makefile
+++ b/deal.II/examples/step-5/Makefile
@@ -137,9 +137,7 @@ clean:
 # 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.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep

diff --git a/deal.II/examples/step-6/Makefile b/deal.II/examples/step-6/Makefile
index a92d87c2415c48044837c6672e8ca5efc83eb9cf..8154cc65457d8871980fe4101740cbcbd6407cbd 100644 (file)
--- a/deal.II/examples/step-6/Makefile
+++ b/deal.II/examples/step-6/Makefile
@@ -137,9 +137,7 @@ clean:
 # 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.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep

diff --git a/deal.II/examples/step-7/Makefile b/deal.II/examples/step-7/Makefile
index e829e8ebee6a48efef67fa77370ff227513f2e2f..3b93e6e3e546838c23da73133c724a81e5280cd5 100644 (file)
--- a/deal.II/examples/step-7/Makefile
+++ b/deal.II/examples/step-7/Makefile
@@ -137,9 +137,7 @@ clean:
 # 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.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep

diff --git a/deal.II/examples/step-8/Makefile b/deal.II/examples/step-8/Makefile
index a92d87c2415c48044837c6672e8ca5efc83eb9cf..8154cc65457d8871980fe4101740cbcbd6407cbd 100644 (file)
--- a/deal.II/examples/step-8/Makefile
+++ b/deal.II/examples/step-8/Makefile
@@ -137,9 +137,7 @@ clean:
 # 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.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep

diff --git a/deal.II/examples/step-9/Makefile b/deal.II/examples/step-9/Makefile
index a92d87c2415c48044837c6672e8ca5efc83eb9cf..8154cc65457d8871980fe4101740cbcbd6407cbd 100644 (file)
--- a/deal.II/examples/step-9/Makefile
+++ b/deal.II/examples/step-9/Makefile
@@ -137,9 +137,7 @@ clean:
 # 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.
 Makefile.dep: $(target).cc Makefile \
-              $(shell echo $(include-path-base)/base/*.h    \
-                           $(include-path-lac)/lac/*.h      \
-                           $(include-path-deal2)/*/*.h)
+              $(shell echo $D/*/include/*/*.h)
        @echo ============================ Remaking $@
        @$D/common/scripts/make_dependencies  $(INCLUDE) -B. $(target).cc \
                > Makefile.dep