arch and indep

diff --git a/.gitignore b/.gitignore
index 26ff7529d04a9e6570566111d87ae726939150a4..f6e8c30dbd49f5fc9ef898e6e018a699abecc0e1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 *~
 *.o
 
-build
+build_arch
 
 cprogs/readbuffer
 cprogs/writebuffer

diff --git a/debian/changelog b/debian/changelog
index 64babeea81c667b6fa7ba99e17b874b3c97e0d7e..7520e204fed2f104c16a127831594dcfb9fbc380 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ chiark-utils (4.1.31~~iwj) unstable; urgency=low
     - In the code, rename pix_... variables to be named after the meaning
       rather than the default colour.
 
+  * Provide build-arch and build-indep debian/rules targets.
   * Fix the type of a callback function passed to scandir, to expect
     struct dirent**'s rather than void*'s.
   * Add -Wno-pointer-sign to gcc warning options.

diff --git a/debian/rules b/debian/rules
index 7ac91e218d491536c56eb651c445001d5c09e5bc..792219688b2f01e6669d38ee9533a535888ab541 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 SHELL=/bin/bash
 
-subdirs_build= cprogs
+subdirs_build_arch=    cprogs
 subdirs_nobuild=backup sync-accounts scripts
 package=       chiark-utils
 packages_indep=        chiark-backup chiark-scripts
@@ -13,10 +13,14 @@ cwd=        $(shell pwd)
 d=     $(cwd)/debian
 t=     $d/tmp
 
-build:
+build_arch:
        $(checkdir)
-       set -e; for s in $(subdirs_build); do $(MAKE) -C $$s all; done
-       touch build
+       set -e; for s in $(subdirs_build_arch); do $(MAKE) -C $$s all; done
+       touch build_arch
+
+build_indep:
+
+build: build_arch build_indep
 
 clean:
        $(checkdir)