The module and ABI checks are not independent, so make sure
the modules check is dependent on the ABI check having been
performed. Also drop some superfluous shortcuts along the way.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
install-%: basepkg = $(hdrs_pkg_name)
install-%: hdrdir = $(CURDIR)/debian/$(basepkg)-$*/usr/src/$(basepkg)-$*
install-%: target_flavour = $*
install-%: basepkg = $(hdrs_pkg_name)
install-%: hdrdir = $(CURDIR)/debian/$(basepkg)-$*/usr/src/$(basepkg)-$*
install-%: target_flavour = $*
-install-%: $(stampdir)/stamp-build-% checks-%
dh_testdir
dh_testroot
dh_clean -k -p$(bin_pkg_name)-$*
dh_testdir
dh_testroot
dh_clean -k -p$(bin_pkg_name)-$*
# Check ABI for package against last release (if not same abinum)
# Check ABI for package against last release (if not same abinum)
-abi-%: $(abidir)/%
- @# Empty for make to be happy
$(abidir)/%: $(stampdir)/stamp-build-%
install -d $(abidir)
sed -e 's/^\(.\+\)[[:space:]]\+\(.\+\)[[:space:]]\(.\+\)$$/\3 \2 \1/' \
$(abidir)/%: $(stampdir)/stamp-build-%
install -d $(abidir)
sed -e 's/^\(.\+\)[[:space:]]\+\(.\+\)[[:space:]]\(.\+\)$$/\3 \2 \1/' \
"$(prev_abidir)" "$(abidir)" "$(skipabi)"
# Check the module list against the last release (always)
"$(prev_abidir)" "$(abidir)" "$(skipabi)"
# Check the module list against the last release (always)
-module-%: $(abidir)/%.modules
- @# Empty for make to be happy
-$(abidir)/%.modules: $(stampdir)/stamp-build-%
+$(abidir)/%.modules: abi-check-%
install -d $(abidir)
find $(builddir)/build-$*/ -name \*.ko | \
sed -e 's/.*\/\([^\/]*\)\.ko/\1/' | sort > $@
install -d $(abidir)
find $(builddir)/build-$*/ -name \*.ko | \
sed -e 's/.*\/\([^\/]*\)\.ko/\1/' | sort > $@
@perl -f $(DROOT)/scripts/module-check "$*" \
"$(prev_abidir)" "$(abidir)" $(skipmodule)
@perl -f $(DROOT)/scripts/module-check "$*" \
"$(prev_abidir)" "$(abidir)" $(skipmodule)
-checks-%: abi-check-% module-check-%
+checks-%: module-check-%
@# Will be calling more stuff later
# Check the config against the known options list.
@# Will be calling more stuff later
# Check the config against the known options list.