From 1138bda5ffb72cabd6ee047bf70d2758c1ecefef Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 21 Mar 2016 01:42:24 +0000 Subject: [PATCH] Clean up tools build rules * Rename the make macro from submake to make-tools * Rename debian/stamps/build to debian/stamps/build-tools * Build them all under debian/build/build-tools/ --- debian/rules.d/Makefile.inc | 5 +++-- debian/rules.real | 32 ++++++++++++++++---------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/debian/rules.d/Makefile.inc b/debian/rules.d/Makefile.inc index 3da8eae56..2f05db4f3 100644 --- a/debian/rules.d/Makefile.inc +++ b/debian/rules.d/Makefile.inc @@ -9,8 +9,9 @@ CC = gcc CXX = g++ CFLAGS := $(shell dpkg-buildflags --get CFLAGS) -Wall CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) \ - -I$(top_srcdir)/$(OUTDIR) -I$(top_srcdir)/debian/build/$(OUTDIR) \ - -isystem $(top_srcdir)/debian/build/include + -I$(top_srcdir)/$(OUTDIR) \ + -I$(top_srcdir)/debian/build/build-tools/$(OUTDIR) \ + -isystem $(top_srcdir)/debian/build/build-tools/include CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) -Wall LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) diff --git a/debian/rules.real b/debian/rules.real index c4a6d3375..09796b469 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -479,23 +479,23 @@ install-source: $(BUILD_DIR)/$(SOURCE_PACKAGE_NAME)-source-$(UPSTREAMVERSION).ta # other things (#725492). So use the fastest real gzip mode. +$(MAKE_SELF) install-base BUILDDEB_ARGS='-Zgzip -z1' -define submake -+mkdir -p $(BUILD_DIR)/$(1) && $(MAKE_CLEAN) -C $(BUILD_DIR)/$(1) -f $(CURDIR)/debian/rules.d/$(1)/Makefile top_srcdir=$(CURDIR) top_rulesdir=$(CURDIR)/debian/rules.d OUTDIR=$(1) +define make-tools ++mkdir -p $(BUILD_DIR)/build-tools/$(1) && $(MAKE_CLEAN) -C $(BUILD_DIR)/build-tools/$(1) -f $(CURDIR)/debian/rules.d/$(1)/Makefile top_srcdir=$(CURDIR) top_rulesdir=$(CURDIR)/debian/rules.d OUTDIR=$(1) endef $(STAMPS_DIR)/build-tools: - $(call submake,.) + $(call make-tools,.) @$(stamp) install-kbuild: PACKAGE_NAME = linux-kbuild-$(VERSION) install-kbuild: DH_OPTIONS = -p$(PACKAGE_NAME) install-kbuild: PREFIX_DIR = /usr/lib/$(PACKAGE_NAME) install-kbuild: DIR = $(CURDIR)/debian/$(PACKAGE_NAME) -install-kbuild: $(STAMPS_DIR)/build +install-kbuild: $(STAMPS_DIR)/build-tools dh_testdir dh_testroot dh_prep - $(call submake,scripts) install DESTDIR=$(DIR) prefix=$(PREFIX_DIR) + $(call make-tools,scripts) install DESTDIR=$(DIR) prefix=$(PREFIX_DIR) dh_link $(PREFIX_DIR) /usr/src/$(PACKAGE_NAME) dh_installchangelogs dh_installdocs @@ -510,11 +510,11 @@ install-kbuild: $(STAMPS_DIR)/build install-cpupower: DH_OPTIONS = -plinux-cpupower -plibcpupower0 -plibcpupower-dev install-cpupower: DIR = $(CURDIR)/debian/cpupower-tmp -install-cpupower: $(STAMPS_DIR)/build +install-cpupower: $(STAMPS_DIR)/build-tools dh_testdir dh_testroot dh_prep - $(call submake,tools/power/cpupower) install DESTDIR=$(DIR) + $(call make-tools,tools/power/cpupower) install DESTDIR=$(DIR) dh_install --sourcedir=$(DIR) dh_installchangelogs dh_installdocs @@ -531,11 +531,11 @@ install-cpupower: $(STAMPS_DIR)/build install-perf: PACKAGE_NAME = linux-perf-$(VERSION) install-perf: DH_OPTIONS = -p$(PACKAGE_NAME) install-perf: DIR = $(CURDIR)/debian/$(PACKAGE_NAME) -install-perf: $(STAMPS_DIR)/build +install-perf: $(STAMPS_DIR)/build-tools dh_testdir dh_testroot dh_prep - $(call submake,tools/perf) install DESTDIR=$(DIR) + $(call make-tools,tools/perf) install DESTDIR=$(DIR) dh_perl /usr/share/perf_$(VERSION)-core/scripts/perl/Perf-Trace-Util/lib/ dh_python2 /usr/share/perf_$(VERSION)-core/scripts/python/Perf-Trace-Util/lib/ dh_installchangelogs @@ -552,12 +552,12 @@ install-perf: $(STAMPS_DIR)/build install-usbip: DH_OPTIONS = -plibusbip-dev -pusbip install-usbip: DIR = $(CURDIR)/debian/usbip-tmp -install-usbip: override VERSION := $(shell sed -ne 's,^#define PACKAGE_VERSION "\(.*\)"$$,\1,p' $(BUILD_DIR)/tools/usb/usbip/config.h) -install-usbip: $(STAMPS_DIR)/build +install-usbip: override VERSION := $(shell sed -ne 's,^#define PACKAGE_VERSION "\(.*\)"$$,\1,p' $(BUILD_DIR)/build-tools/tools/usb/usbip/config.h) +install-usbip: $(STAMPS_DIR)/build-tools dh_testdir dh_testroot dh_prep - $(call submake,tools/usb/usbip) install DESTDIR=$(DIR) + $(call make-tools,tools/usb/usbip) install DESTDIR=$(DIR) dh_install --sourcedir=$(DIR) dh_installchangelogs dh_installdocs @@ -575,11 +575,11 @@ install-usbip: $(STAMPS_DIR)/build install-hyperv-daemons: PACKAGE_NAME = hyperv-daemons install-hyperv-daemons: DH_OPTIONS = -p$(PACKAGE_NAME) install-hyperv-daemons: DIR = $(CURDIR)/debian/$(PACKAGE_NAME) -install-hyperv-daemons: $(STAMPS_DIR)/build +install-hyperv-daemons: $(STAMPS_DIR)/build-tools dh_testdir dh_testroot dh_prep - $(call submake,tools/hv) install DESTDIR=$(DIR) + $(call make-tools,tools/hv) install DESTDIR=$(DIR) dh_install for service in fcopy kvp vss; do \ install -D -m755 debian/hyperv-daemons.hv-$$service-daemon.init \ @@ -607,11 +607,11 @@ install-hyperv-daemons: $(STAMPS_DIR)/build install-liblockdep: DH_OPTIONS = -pliblockdep$(VERSION) -pliblockdep-dev install-liblockdep: DIR = $(CURDIR)/debian/liblockdep-tmp -install-liblockdep: $(STAMPS_DIR)/build +install-liblockdep: $(STAMPS_DIR)/build-tools dh_testdir dh_testroot dh_prep - $(call submake,tools/lib/lockdep) install DESTDIR=$(DIR) + $(call make-tools,tools/lib/lockdep) install DESTDIR=$(DIR) env -u DH_OPTIONS dh_install -pliblockdep$(VERSION) --sourcedir=$(DIR) \ 'usr/lib/*/liblockdep.so.*' dh_install --sourcedir=$(DIR)