package xserver-xorg-video-sunffb
tags 471193 + patch
thanks
Attached is a patch that makes debian/rules concurency clean (and also
adds build-arch/build-indep rules, as they come at no cost).
Hochachtungsvoll,
Bernhard R. Link
>From 2e3fc3a4b3e80773d999f0209ccad848b44b1810 Mon Sep 17 00:00:00 2001
From: Bernhard R. Link <[EMAIL PROTECTED]>
Date: Thu, 20 Mar 2008 14:40:50 +0100
Subject: [PATCH] Make debian/rules -j2 clean and add build-* targets
build-stamp now depends on $(STAMP_DIR)/patch to make sure
the source is actually patched before building it.
(It must be the stamp file as the patch target is phony).
added build-arch and build-indep targets and install and
binary-* only depending on the appropiate targets.
serverabi now depends on install, to ensure install's
dh_clean -k is called before amending substvars.
---
debian/rules | 15 +++++++++------
debian/xsfbs/xsfbs.mk | 2 +-
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/debian/rules b/debian/rules
index 205b867..fa491ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+SERVERABIDEPENDS = install
include debian/xsfbs/xsfbs.mk
CFLAGS = -Wall -g
@@ -31,8 +32,10 @@ endif
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-build: patch build-stamp
-build-stamp:
+build-indep:
+build-arch: build-stamp
+build: build-stamp
+build-stamp: $(STAMP_DIR)/patch
dh_testdir
mkdir obj-$(DEB_BUILD_GNU_TYPE)
@@ -57,7 +60,7 @@ clean: xsfclean
dh_clean
-install: build
+install: build-arch
dh_testdir
dh_testroot
dh_clean -k
@@ -66,7 +69,7 @@ install: build
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-dependent files here.
-binary-arch: build install serverabi
+binary-arch: install serverabi
dh_testdir
dh_testroot
@@ -84,8 +87,8 @@ binary-arch: build install serverabi
dh_builddeb
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep:
# Nothing to do
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index b8f7afd..cb5f584 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -350,7 +350,7 @@ PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
.PHONY: serverabi
-serverabi:
+serverabi: $(SERVERABIDEPENDS)
ifeq ($(SERVERMINVERS),)
@echo error: xserver-xorg-dev needs to be installed
@exit 1
--
1.5.4.4
