diff --git a/debian/rules b/debian/rules index bdd1d24f1..8cf6357c4 100755 --- a/debian/rules +++ b/debian/rules @@ -9,8 +9,6 @@ VERSION_BINNMU := $(shell echo "$(VERSION)" | sed -ne 's,.*+b\(.*\)$$,\1,p') include debian/rules.defs -stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@ - ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) DEBIAN_KERNEL_JOBS := $(subst parallel=,,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif @@ -20,31 +18,23 @@ endif .NOTPARALLEL: -source: debian/control $(STAMPS_DIR)/source-base -$(STAMPS_DIR)/source-base: +source: debian/control dh_testdir $(MAKE) -f debian/rules.gen source - @$(stamp) -setup: debian/control $(STAMPS_DIR)/setup-base -$(STAMPS_DIR)/setup-base: $(STAMPS_DIR)/source-base +setup: debian/control dh_testdir $(MAKE) -f debian/rules.gen setup_$(DEB_HOST_ARCH) - @$(stamp) build: build-arch build-indep -build-arch: debian/control $(STAMPS_DIR)/build-arch-base -$(STAMPS_DIR)/build-arch-base: $(STAMPS_DIR)/setup-base +build-arch: debian/control dh_testdir $(MAKE) -f debian/rules.gen build-arch_$(DEB_HOST_ARCH) - @$(stamp) -build-indep: debian/control $(STAMPS_DIR)/build-indep-base -$(STAMPS_DIR)/build-indep-base: $(STAMPS_DIR)/setup-base +build-indep: debian/control dh_testdir $(MAKE) -f debian/rules.gen build-indep - @$(stamp) DIR_ORIG = ../orig/$(SOURCE)-$(VERSION_UPSTREAM) TAR_ORIG_NAME = $(SOURCE)_$(VERSION_UPSTREAM).orig.tar.xz @@ -71,11 +61,11 @@ clean: debian/control rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc debian/linux-headers-* debian/linux-image-* debian/linux-support-* debian/linux-source-* debian/linux-doc-* debian/linux-manual-* debian/xen-linux-system-* debian/*-modules-*-di* dh_clean -binary-indep: $(STAMPS_DIR)/build-indep-base +binary-indep: dh_testdir $(MAKE) -f debian/rules.gen binary-indep -binary-arch: $(STAMPS_DIR)/build-arch-base +binary-arch: dh_testdir $(MAKE) -f debian/rules.gen binary-arch_$(DEB_HOST_ARCH)