From 96cd997e7f7be52f2165ec8c9aeaa4a28e9de6de Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 10 Aug 2008 09:56:39 +0000 Subject: [PATCH] debian/rules.real: Mark all sub-make rules. svn path=/dists/trunk/linux-2.6/; revision=12019 --- debian/rules.real | 60 +++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/debian/rules.real b/debian/rules.real index bf514194c..980a5a00b 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -119,13 +119,13 @@ endif ifdef CFLAGS echo 'CFLAGS += $(CFLAGS)' >> '$(DIR)/.kernelvariables' endif - $(MAKE_CLEAN) -C '$(DIR)' reportoldconfig + +$(MAKE_CLEAN) -C '$(DIR)' reportoldconfig $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET) $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_kernel-package: - $(MAKE_SELF) setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_all + +$(MAKE_SELF) setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_all mkdir -p '$(DIR)/debian' cp debian/{changelog,control,copyright} '$(DIR)/debian' touch '$(DIR)/debian/official' @@ -135,8 +135,8 @@ $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_kernel-package: $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain \ $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape \ $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: - $(MAKE_SELF) setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_all - $(MAKE_CLEAN) -C '$(DIR)' $(JOBS_ARG) prepare + +$(MAKE_SELF) setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_all + +$(MAKE_CLEAN) -C '$(DIR)' $(JOBS_ARG) prepare touch '$@' $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) @@ -152,7 +152,7 @@ $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape: BUILD_TARG $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain \ $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape \ $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: - $(MAKE_CLEAN) -C '$(DIR)' $(JOBS_ARG) $(BUILD_TARGET) + +$(MAKE_CLEAN) -C '$(DIR)' $(JOBS_ARG) $(BUILD_TARGET) python debian/bin/abicheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR) touch '$@' @@ -161,8 +161,8 @@ $(STAMPS_DIR)/build-doc: DIR=$(BUILD_DIR)/build-doc $(STAMPS_DIR)/build-doc: $(STAMPS_DIR)/source rm -rf $(DIR) mkdir $(DIR) - $(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' $(JOBS_ARG) xmldocs - $(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' $(JOBS_ARG) htmldocs mandocs + +$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' $(JOBS_ARG) xmldocs + +$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' $(JOBS_ARG) htmldocs mandocs touch '$@' install-base: @@ -195,7 +195,7 @@ install-doc: $(STAMPS_DIR)/build-doc | \ cpio -pd --preserve-modification-time '$(CURDIR)/$(OUT_DIR)/html' gzip -9qfr $(OUT_DIR)/Documentation - $(MAKE_SELF) install-base + +$(MAKE_SELF) install-base install-manual: PACKAGE_NAME = linux-manual-$(VERSION) install-manual: DIR=$(BUILD_DIR)/build-doc @@ -203,20 +203,20 @@ install-manual: DH_OPTIONS = -p$(PACKAGE_NAME) install-manual: $(STAMPS_DIR)/build-doc dh_clean -d -k find $(DIR)/Documentation/DocBook/man/ -name '*.9' | xargs dh_installman - $(MAKE_SELF) install-base + +$(MAKE_SELF) install-base install-dummy: dh_testdir dh_testroot dh_clean -d -k - $(MAKE_SELF) install-base + +$(MAKE_SELF) install-base install-headers_$(ARCH): PACKAGE_NAMES = linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all-$(ARCH) install-headers_$(ARCH): DH_OPTIONS = $(foreach p, $(PACKAGE_NAMES), -p$(p)) install-headers_$(ARCH): dh_testdir dh_testroot - $(MAKE_SELF) install-base GENCONTROL_ARGS='-Vkernel:Arch=$(ARCH)' + +$(MAKE_SELF) install-base GENCONTROL_ARGS='-Vkernel:Arch=$(ARCH)' install-headers_$(ARCH)_$(FEATURESET): PACKAGE_NAME = linux-headers-$(UPSTREAMVERSION)$(ABINAME)-common$(LOCALVERSION_HEADERS) install-headers_$(ARCH)_$(FEATURESET): DH_OPTIONS = -p$(PACKAGE_NAME) @@ -245,7 +245,7 @@ install-headers_$(ARCH)_$(FEATURESET): $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET ) \ | \ cpio -pd --preserve-modification-time '$(CURDIR)/$(DIR)' - $(MAKE_SELF) install-base + +$(MAKE_SELF) install-base install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION) install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME = linux-headers-$(REAL_VERSION) @@ -321,7 +321,7 @@ install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$( mkdir -p $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION) ln -s /usr/src/$(PACKAGE_NAME) $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/build - $(MAKE_SELF) install-base + +$(MAKE_SELF) install-base install-libc-dev_$(ARCH): PACKAGE_NAME = linux-libc-dev install-libc-dev_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME) @@ -334,11 +334,11 @@ install-libc-dev_$(ARCH): dh_clean -d -k rm -rf '$(DIR)' mkdir $(DIR) - $(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_check ARCH=$(LIBC_DEV_ARCH) - $(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_install ARCH=$(LIBC_DEV_ARCH) INSTALL_HDR_PATH='$(CURDIR)'/$(OUT_DIR) + +$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_check ARCH=$(LIBC_DEV_ARCH) + +$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_install ARCH=$(LIBC_DEV_ARCH) INSTALL_HDR_PATH='$(CURDIR)'/$(OUT_DIR) # XXX: Needs to be removed from libc6-dev rm -rf $(OUT_DIR)/include/scsi - $(MAKE_SELF) install-base + +$(MAKE_SELF) install-base install-support: PACKAGE_NAME = linux-support-$(UPSTREAMVERSION)$(ABINAME) install-support: DH_OPTIONS = -p$(PACKAGE_NAME) @@ -354,7 +354,7 @@ install-support: cp debian/modules/* $(PACKAGE_DIR)$(PACKAGE_ROOT)/modules chmod a+x $(PACKAGE_DIR)$(PACKAGE_ROOT)/modules/gencontrol.py dh_pycentral /usr/src/$(PACKAGE_NAME)/lib/python - $(MAKE_SELF) install-base + +$(MAKE_SELF) install-base install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION) install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): PACKAGE_NAME = linux-image-$(REAL_VERSION) @@ -377,22 +377,22 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain: dh_testroot dh_clean -d -k dh_installdirs 'boot' - $(MAKE_SELF) \ + +$(MAKE_SELF) \ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_image \ DIR='$(DIR)' PACKAGE_DIR='$(PACKAGE_DIR)' INSTALL_DIR='$(INSTALL_DIR)' REAL_VERSION='$(REAL_VERSION)' ifeq ($(MODULES),True) - $(MAKE_CLEAN) -C $(DIR) modules_install INSTALL_MOD_PATH='$(CURDIR)'/$(PACKAGE_DIR) + +$(MAKE_CLEAN) -C $(DIR) modules_install INSTALL_MOD_PATH='$(CURDIR)'/$(PACKAGE_DIR) cp $(DIR)/.config $(PACKAGE_DIR)/boot/config-$(REAL_VERSION) cp $(DIR)/System.map $(PACKAGE_DIR)/boot/System.map-$(REAL_VERSION) rm $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source,modules.*} endif - $(MAKE_SELF) \ + +$(MAKE_SELF) \ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates \ PACKAGE_DIR='$(PACKAGE_DIR)' REAL_VERSION='$(REAL_VERSION)' - $(MAKE_SELF) \ + +$(MAKE_SELF) \ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug \ PACKAGE_DIR='$(PACKAGE_DIR)' PACKAGE_NAME='$(PACKAGE_NAME)' REAL_VERSION='$(REAL_VERSION)' - $(MAKE_SELF) install-base + +$(MAKE_SELF) install-base install-image_amd64_$(FEATURESET)_$(FLAVOUR)_plain_image \ install-image_i386_$(FEATURESET)_$(FLAVOUR)_plain_image: @@ -406,10 +406,10 @@ install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_image: install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION) ifeq ($(KERNEL_ARCH),ppc) # TODO: GNA - $(MAKE_CLEAN) -C '$(DIR)/arch/ppc/boot' mkvmlinuz_support_install \ + +$(MAKE_CLEAN) -C '$(DIR)/arch/ppc/boot' mkvmlinuz_support_install \ INSTALL_MKVMLINUZ='$(WRAPPER_INSTALL_DIR)' else - $(MAKE_CLEAN) -C '$(DIR)' bootwrapper_install \ + +$(MAKE_CLEAN) -C '$(DIR)' bootwrapper_install \ WRAPPER_OBJDIR='$(WRAPPER_INSTALL_DIR)' \ WRAPPER_DTSDIR='$(WRAPPER_INSTALL_DIR)'/dts \ WRAPPER_BINDIR='$(WRAPPER_INSTALL_DIR)' @@ -462,7 +462,7 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape: dh_clean -d -k dh_installdirs 'boot' install -m644 '$(DIR)/arch/s390/boot/image' $(PACKAGE_DIR)/boot/vmlinuz-$(REAL_VERSION) - $(MAKE_SELF) install-base + +$(MAKE_SELF) install-base install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: MODULES_PACKAGE_NAME = linux-modules-$(REAL_VERSION) install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: MODULES_PACKAGE_DIR = debian/$(MODULES_PACKAGE_NAME) @@ -474,7 +474,7 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: dh_installdirs -p$(PACKAGE_NAME) boot 'var/lib/$(PACKAGE_NAME)' dh_installdirs -p$(MODULES_PACKAGE_NAME) boot cp '$(DIR)'/arch/$(KERNEL_ARCH)/boot/vmlinuz $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION) - $(MAKE_CLEAN) -C $(DIR) modules_install INSTALL_MOD_PATH='$(CURDIR)'/$(MODULES_PACKAGE_DIR) + +$(MAKE_CLEAN) -C $(DIR) modules_install INSTALL_MOD_PATH='$(CURDIR)'/$(MODULES_PACKAGE_DIR) cp $(DIR)/.config $(MODULES_PACKAGE_DIR)/boot/config-$(REAL_VERSION) cp $(DIR)/System.map $(MODULES_PACKAGE_DIR)/boot/System.map-$(REAL_VERSION) rm $(MODULES_PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source} @@ -482,7 +482,7 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: for i in $(XEN_VERSIONS); do echo $$i; done > $(PACKAGE_DIR)/var/lib/$(PACKAGE_NAME)/xen-versions install -d $(PACKAGE_DIR)/DEBIAN echo /var/lib/$(PACKAGE_NAME)/xen-versions >> $(PACKAGE_DIR)/DEBIAN/conffiles - $(MAKE_SELF) install-base DH_OPTIONS='-p$(PACKAGE_NAME) -p$(MODULES_PACKAGE_NAME)' + +$(MAKE_SELF) install-base DH_OPTIONS='-p$(PACKAGE_NAME) -p$(MODULES_PACKAGE_NAME)' install-patch: PACKAGE = linux-patch-debian-$(VERSION) install-patch: pbase := /usr/src/kernel-patches/all/$(UPSTREAMVERSION) @@ -497,17 +497,17 @@ install-patch: install debian/bin/patch.apply '$(pfull)/apply/debian' install debian/templates/patch.unpatch '$(pfull)/unpatch/debian' find '$(pfull)/debian' ! -path '*/series/*' -type f -execdir bzip2 '{}' ';' -execdir chmod 644 '{}.bz2' ';' - $(MAKE_SELF) install-base DH_OPTIONS='$(DH_OPTIONS)' + +$(MAKE_SELF) install-base DH_OPTIONS='$(DH_OPTIONS)' install-source: DH_OPTIONS = -plinux-source-$(VERSION) install-source: $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2 dh_testdir dh_testroot dh_install $(DH_OPTIONS) '$<' /usr/src - $(MAKE_SELF) install-base DH_OPTIONS='$(DH_OPTIONS)' + +$(MAKE_SELF) install-base DH_OPTIONS='$(DH_OPTIONS)' install-tree: DH_OPTIONS = -plinux-tree-$(VERSION) install-tree: - $(MAKE_SELF) install-dummy DH_OPTIONS='$(DH_OPTIONS)' + +$(MAKE_SELF) install-dummy DH_OPTIONS='$(DH_OPTIONS)' # vim: filetype=make