Add a per-dcf_root disfigure target

Use it subsystems. This allows one to have sub-projects with
separate build configurations.

13 files changed, 15 insertions, 17 deletions

diff --git a/build/bootstrap.make b/build/bootstrap.make
index f42b6c6..d30bd26 100644
--- a/build/bootstrap.make
+++ b/build/bootstrap.make
@@ -327,11 +327,10 @@ endif
 # `disfigure' target.
 #
 .PHONY: disfigure
+.PHONY: $(dcf_root)/.disfigure
 
-disfigure:: $(build_absolute_clean_target)
+disfigure:: $(build_absolute_clean_target) $(dcf_root)/.disfigure
 
-#@@ Is there a better way?
-#
 ifeq ($(.DEFAULT_GOAL),disfigure)
 .DEFAULT_GOAL :=
 endif
diff --git a/build/c/configuration-rules.make b/build/c/configuration-rules.make
index 836fa1d..53adeb7 100644
--- a/build/c/configuration-rules.make
+++ b/build/c/configuration-rules.make
@@ -12,7 +12,7 @@ $(dcf_root)/c/configuration-dynamic.make: | $(dcf_root)/c/.
 
 ifndef %foreign%
 
-disfigure::
+$(dcf_root)/.disfigure::
 	$(call message,rm $(dcf_root)/c/configuration-dynamic.make,\
 rm -f $(dcf_root)/c/configuration-dynamic.make)
 
diff --git a/build/c/generic/configuration-rules.make b/build/c/generic/configuration-rules.make
index 5fa9117..6cd2d5b 100644
--- a/build/c/generic/configuration-rules.make
+++ b/build/c/generic/configuration-rules.make
@@ -8,7 +8,7 @@ $(dcf_root)/c/generic/configuration-dynamic.make: | $(dcf_root)/c/generic/.
 
 ifndef %foreign%
 
-disfigure::
+$(dcf_root)/.disfigure::
 	$(call message,rm $(dcf_root)/c/generic/configuration-dynamic.make,\
 rm -f $(dcf_root)/c/generic/configuration-dynamic.make)
 
diff --git a/build/c/generic/configuration-sl-rules.make b/build/c/generic/configuration-sl-rules.make
index e685be6..da2d0ad 100644
--- a/build/c/generic/configuration-sl-rules.make
+++ b/build/c/generic/configuration-sl-rules.make
@@ -8,7 +8,7 @@ $(dcf_root)/c/generic/configuration-sl-dynamic.make: | $(dcf_root)/c/generic/.
 
 ifndef %foreign%
 
-disfigure::
+$(dcf_root)/.disfigure::
 	$(call message,rm $(dcf_root)/c/generic/configuration-sl-dynamic.make,\
 rm -f $(dcf_root)/c/generic/configuration-sl-dynamic.make)
 
diff --git a/build/c/gnu/configuration-rules.make b/build/c/gnu/configuration-rules.make
index 478db2d..0b3e977 100644
--- a/build/c/gnu/configuration-rules.make
+++ b/build/c/gnu/configuration-rules.make
@@ -8,7 +8,7 @@ $(dcf_root)/c/gnu/configuration-dynamic.make: | $(dcf_root)/c/gnu/.
 
 ifndef %foreign%
 
-disfigure::
+$(dcf_root)/.disfigure::
 	$(call message,rm $(dcf_root)/c/gnu/configuration-dynamic.make,\
 rm -f $(dcf_root)/c/gnu/configuration-dynamic.make)
 
diff --git a/build/c/intel/configuration-rules.make b/build/c/intel/configuration-rules.make
index e464e00..407c071 100644
--- a/build/c/intel/configuration-rules.make
+++ b/build/c/intel/configuration-rules.make
@@ -8,7 +8,7 @@ $(dcf_root)/c/intel/configuration-dynamic.make: | $(dcf_root)/c/intel/.
 
 ifndef %foreign%
 
-disfigure::
+$(dcf_root)/.disfigure::
 	$(call message,rm $(dcf_root)/c/intel/configuration-dynamic.make,\
 rm -f $(dcf_root)/c/intel/configuration-dynamic.make)
 
diff --git a/build/cxx/configuration-rules.make b/build/cxx/configuration-rules.make
index 354791e..ecbadd4 100644
--- a/build/cxx/configuration-rules.make
+++ b/build/cxx/configuration-rules.make
@@ -12,7 +12,7 @@ $(dcf_root)/cxx/configuration-dynamic.make: | $(dcf_root)/cxx/.
 
 ifndef %foreign%
 
-disfigure::
+$(dcf_root)/.disfigure::
 	$(call message,rm $(dcf_root)/cxx/configuration-dynamic.make,\
 rm -f $(dcf_root)/cxx/configuration-dynamic.make)
 
diff --git a/build/cxx/generic/configuration-rules.make b/build/cxx/generic/configuration-rules.make
index bb4fe67..4450ca8 100644
--- a/build/cxx/generic/configuration-rules.make
+++ b/build/cxx/generic/configuration-rules.make
@@ -8,7 +8,7 @@ $(dcf_root)/cxx/generic/configuration-dynamic.make: | $(dcf_root)/cxx/generic/.
 
 ifndef %foreign%
 
-disfigure::
+$(dcf_root)/.disfigure::
 	$(call message,rm $(dcf_root)/cxx/generic/configuration-dynamic.make,\
 rm -f $(dcf_root)/cxx/generic/configuration-dynamic.make)
 
diff --git a/build/cxx/generic/configuration-sl-rules.make b/build/cxx/generic/configuration-sl-rules.make
index cbcf160..ada344a 100644
--- a/build/cxx/generic/configuration-sl-rules.make
+++ b/build/cxx/generic/configuration-sl-rules.make
@@ -8,7 +8,7 @@ $(dcf_root)/cxx/generic/configuration-sl-dynamic.make: | $(dcf_root)/cxx/generic
 
 ifndef %foreign%
 
-disfigure::
+$(dcf_root)/.disfigure::
 	$(call message,rm $(dcf_root)/cxx/generic/configuration-sl-dynamic.make,\
 rm -f $(dcf_root)/cxx/generic/configuration-sl-dynamic.make)
 
diff --git a/build/cxx/gnu/configuration-rules.make b/build/cxx/gnu/configuration-rules.make
index 7598be9..e621640 100644
--- a/build/cxx/gnu/configuration-rules.make
+++ b/build/cxx/gnu/configuration-rules.make
@@ -8,7 +8,7 @@ $(dcf_root)/cxx/gnu/configuration-dynamic.make: | $(dcf_root)/cxx/gnu/.
 
 ifndef %foreign%
 
-disfigure::
+$(dcf_root)/.disfigure::
 	$(call message,rm $(dcf_root)/cxx/gnu/configuration-dynamic.make,\
 rm -f $(dcf_root)/cxx/gnu/configuration-dynamic.make)
 
diff --git a/build/cxx/intel/configuration-rules.make b/build/cxx/intel/configuration-rules.make
index 577f2f7..0e35793 100644
--- a/build/cxx/intel/configuration-rules.make
+++ b/build/cxx/intel/configuration-rules.make
@@ -8,7 +8,7 @@ $(dcf_root)/cxx/intel/configuration-dynamic.make: | $(dcf_root)/cxx/intel/.
 
 ifndef %foreign%
 
-disfigure::
+$(dcf_root)/.disfigure::
 	$(call message,rm $(dcf_root)/cxx/intel/configuration-dynamic.make,\
 rm -f $(dcf_root)/cxx/intel/configuration-dynamic.make)
 
diff --git a/build/ld/configuration-lib-rules.make b/build/ld/configuration-lib-rules.make
index 686d975..7c7261b 100644
--- a/build/ld/configuration-lib-rules.make
+++ b/build/ld/configuration-lib-rules.make
@@ -9,7 +9,7 @@ $(dcf_root)/ld/configuration-lib-dynamic.make: | $(dcf_root)/ld/.
 
 ifndef %foreign%
 
-disfigure::
+$(dcf_root)/.disfigure::
 	$(call message,rm $(dcf_root)/ld/configuration-lib-dynamic.make,\
 rm -f $(dcf_root)/ld/configuration-lib-dynamic.make)
 
diff --git a/build/system/configuration-rules.make b/build/system/configuration-rules.make
index b1aa605..0a4198b 100644
--- a/build/system/configuration-rules.make
+++ b/build/system/configuration-rules.make
@@ -11,14 +11,13 @@ ifeq ($(.DEFAULT_GOAL),$(dcf_root)/system/configuration-dynamic.make)
 .DEFAULT_GOAL :=
 endif
 
-
 ifndef %foreign%
 
-disfigure::
+$(dcf_root)/.disfigure::
 	$(call message,rm $(dcf_root)/system/configuration-dynamic.make,\
 rm -f $(dcf_root)/system/configuration-dynamic.make)
 
-ifeq ($(.DEFAULT_GOAL),disfigure)
+ifeq ($(.DEFAULT_GOAL),$(dcf_root)/.disfigure)
 .DEFAULT_GOAL :=
 endif