diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | debian/rules | 37 |
2 files changed, 23 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog index 677d668..101ff35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,10 @@ gnumach (2:1.3.99.dfsg.cvs20080708-1) UNRELEASED; urgency=low * Use $(filter ...) instead of $(findstring ...) to extract space separated options from DEB_BUILD_OPTIONS in debian/rules. * Merge check targets into build targets. + * Clean up debian/rules: + - Run autoreconf on-demand. + - Support parallel builds by moving 'patch' dependency from + the build to a new pre-patch-* targets that serializes configuration. -- Guillem Jover <guillem@debian.org> Thu, 09 Aug 2007 01:45:22 +0300 diff --git a/debian/rules b/debian/rules index 340e6e5..0ba16c4 100755 --- a/debian/rules +++ b/debian/rules @@ -28,18 +28,10 @@ drivers := \ include /usr/share/quilt/quilt.make -# To be run manually when packaging a new upstream version to update the -# autogenerated autoconf patch. Assumes the patch is the last one. -autoregen: - quilt push -fa || true +configure: configure.ac autoreconf -fi - find -name autom4te.cache -o -name '*~' -o \ - -name '*.rej' -o -name '*.orig' | xargs rm -rf - quilt refresh -p ab - quilt pop -a -configure: patch build/config.status -build/config.status: +build/config.status: configure dh_testdir -mkdir build @@ -49,8 +41,7 @@ build/config.status: --prefix=/usr \ --exec-prefix=/ -configure-dbg: patch build-dbg/config.status -build-dbg/config.status: +build-dbg/config.status: configure dh_testdir -mkdir build-dbg @@ -59,9 +50,16 @@ build-dbg/config.status: --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \ --exec-prefix=/ -build: +# Serialize to support parallel make +pre-patch-std: patch + $(MAKE) -f debian/rules build/config.status + +pre-patch-dbg: patch + $(MAKE) -f debian/rules build-dbg/config.status -build-gnumach: configure +build: build-gnumach-std build-gnumach-dbg + +build-gnumach-std: pre-patch-std dh_testdir ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) @@ -70,7 +68,7 @@ else $(MAKE) -C build check endif -build-gnumach-dbg: configure-dbg +build-gnumach-dbg: pre-patch-dbg dh_testdir ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) @@ -84,10 +82,12 @@ clean: unpatch rm -f machine rm -rf build build-dbg $(D_DBG) + find -name autom4te.cache -o -name '*~' -o \ + -name '*.rej' -o -name '*.orig' | xargs rm -rf dh_clean -install: build-gnumach build-gnumach-dbg +install: build dh_testdir dh_testroot dh_clean -a -k @@ -128,6 +128,7 @@ binary-arch: install dh_md5sums -a dh_builddeb -a -.PHONY: build build-gnumach build-gnumach-dbg clean configure configure-dbg -.PHONY: install-gnumach install-gnumach-dbg binary binary-indep binary-arch +.PHONY: build build-gnumach-std build-gnumach-dbg clean +.PHONY: pre-patch-std pre-patch-dbg +.PHONY: install binary binary-indep binary-arch |