UBUNTU: [Config] Linearize and simplify tree preparation rules

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 0c6a64b..bf8c439 100644 (file)
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -10,9 +10,7 @@ build_cd =
 build_O  = O=$(builddir)/build-$*
 endif
 
-prepare-%: $(stampdir)/stamp-prepare-%
-       @# Empty for make to be happy
-$(stampdir)/stamp-prepare-%: $(stampdir)/stamp-prepare-tree-% prepare-checks-%
+$(stampdir)/stamp-prepare-%: config-prepare-check-%
        @touch $@
 $(stampdir)/stamp-prepare-tree-%: target_flavour = $*
 $(stampdir)/stamp-prepare-tree-%: $(commonconfdir)/config.common.$(family) $(archconfdir)/config.common.$(arch) $(archconfdir)/config.flavour.%
@@ -30,7 +28,7 @@ $(stampdir)/stamp-prepare-tree-%: $(commonconfdir)/config.common.$(family) $(arc
 build-%: $(stampdir)/stamp-build-%
        @# Empty for make to be happy
 $(stampdir)/stamp-build-%: target_flavour = $*
-$(stampdir)/stamp-build-%: prepare-%
+$(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-%
        @echo "Building $*..."
        $(build_cd) $(kmake) $(build_O) $(conc_level) $(build_image)
        $(build_cd) $(kmake) $(build_O) $(conc_level) modules

diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk
index d1c0ad9..cc953b7 100644 (file)
--- a/debian/rules.d/4-checks.mk
+++ b/debian/rules.d/4-checks.mk
@@ -26,5 +26,3 @@ config-prepare-check-%: $(stampdir)/stamp-prepare-tree-%
        @perl -f $(DROOT)/scripts/config-check \
                $(builddir)/build-$*/.config "$(arch)" "$*" "$(sharedconfdir)" "$(skipconfig)"
 
-prepare-checks-%: config-prepare-check-%
-       @# Will be calling more stuff later