debian/rules: add newly required targets, and reorder/tidy

debdiff shows no change to .debs.

Closes: #999242
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/rules b/debian/rules
index b4f4dc5f367397359ebfcd279106f9e4d2003515..134c90a53b5fce6c0cd236d2d3f86885478e16d2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -64,24 +64,12 @@ export INSTALL_SCRIPT
 export INSTALL_DIR
 export STRIP
 
-
-build: 
-       $(MAKE) prefix=/usr CC='$(CC)' LD='$(TOOL_PREFIX)ld'
-
-clean: 
-       $(MAKE) distclean
-       rm -rf debian/{files,substvars,tmp} build
-       rm -f debian/*~ debian/#*# debian/core debian/*.bak
-
-binary-indep:   checkroot build
-       $(checkdir)
-# There are no architecture-independent files to be uploaded
-# generated by this package.  If there were any they would be
-# made here.
-
 lab=libauthbind.so.$(major).$(minor)
 udp=debian/tmp/usr/share/doc/$(package)
 
+build-arch: 
+       $(MAKE) prefix=/usr CC='$(CC)' LD='$(TOOL_PREFIX)ld'
+
 binary-arch:   checkroot build
        rm -rf debian/tmp
        install -d -g root -m 755 -o root debian/tmp/DEBIAN $(udp) \
@@ -100,8 +88,18 @@ binary-arch:        checkroot build
                xargs -0r touch --no-dereference --date="@$$SOURCE_DATE_EPOCH"
        dpkg --build debian/tmp ..
 
-binary:         binary-indep binary-arch
+binary-indep build-indep:
+# There are no architecture-independent files to be uploaded
+# generated by this package.
+
+clean: 
+       $(MAKE) distclean
+       rm -rf debian/{files,substvars,tmp} build
+       rm -f debian/*~ debian/#*# debian/core debian/*.bak
 
 checkroot:
        $(checkdir)
        test root = "`whoami`"
+
+binary:        binary-indep binary-arch
+build: build-indep build-arch