Abolish {auto,}rules.m4 and adjust debian/rules to be able to build

from a completely fresh bzr checkout.

diff --git a/configure.ac b/configure.ac
index a68598a66ccdeb61ee656bc8dec19778652635cb..a9331b2e68c64163f739d05d345e5fc1e993d786 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,9 +19,9 @@
 # USA
 #
 
 # USA
 #
 

-AC_INIT(disorder, 1.5.99+, richard+disorder@sfere.greenend.org.uk)
+AC_INIT([disorder], [1.5.99+], [richard+disorder@sfere.greenend.org.uk])

 AC_CONFIG_AUX_DIR([config.aux])
 AC_CONFIG_AUX_DIR([config.aux])

-AM_INIT_AUTOMAKE(disorder, 1.5.99+)
+AM_INIT_AUTOMAKE(disorder, [1.5.99+])

 AC_CONFIG_SRCDIR([server/disorderd.c])
 AM_CONFIG_HEADER([config.h])
 
 AC_CONFIG_SRCDIR([server/disorderd.c])
 AM_CONFIG_HEADER([config.h])
 

diff --git a/debian/Makefile.am b/debian/Makefile.am
index e9d5108adb4b3f775c32bfd3fb6c1d7ff9634e34..ec4dab2ce8a38d4ff3a69b1d4f7e3c8e2c174e27 100644 (file)
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder
 #
 # This file is part of DisOrder

-# Copyright (C) 2004, 2005 Richard Kettlewell
+# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell

 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -20,20 +20,11 @@
 
 noinst_SCRIPTS=rules
 
 
 noinst_SCRIPTS=rules
 

-autorules_m4=${srcdir}/autorules.m4
-rules_m4=${srcdir}/rules.m4
-
-rules: ${autorules_m4} ${rules_m4}
-       rm -f rules.tmp
-       m4 -P ${autorules_m4} ${rules_m4} > rules.tmp
-       chmod 555 rules.tmp
-       mv -f rules.tmp rules
-
-EXTRA_DIST=README.Debian autorules.m4 config.disorder-server control \
+EXTRA_DIST=README.Debian config.disorder-server control \

           copyright README.RTP \
           etc.disorder.options etc.disorder.config htaccess \
           postinst.disorder-server prerm.disorder-server \
           postrm.disorder-server \
           templates.disorder-server conffiles.disorder-server \
           copyright README.RTP \
           etc.disorder.options etc.disorder.config htaccess \
           postinst.disorder-server prerm.disorder-server \
           postrm.disorder-server \
           templates.disorder-server conffiles.disorder-server \

-          rules.m4 rules changelog usr.share.menu.disobedience \
+          rules changelog usr.share.menu.disobedience \

           postinst.disobedience
           postinst.disobedience

diff --git a/debian/autorules.m4 b/debian/autorules.m4
deleted file mode 100644 (file)
index 63c8e28..0000000
--- a/debian/autorules.m4
+++ /dev/null
@@ -1,149 +0,0 @@
-#! /usr/bin/make -f
-#
-# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
-#
-# This file was generated automatically - edit rules.m4 instead
-#
-
-INSTALL=install
-CONFIGURE=--prefix=/usr
-
-INSTALL_DATA=$(INSTALL) -p -o root -g root -m 644
-INSTALL_PROGRAM=$(INSTALL) -p -o root -g root -m 755
-INSTALL_SCRIPT=$(INSTALL) -p -o root -g root -m 755
-MKDIR=mkdir -p -m 755
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS=-O0 -g
-else
-CFLAGS=-O2 -g
-endif
-export CFLAGS
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-INSTALL_PROGRAM += -s
-endif
-export INSTALL_DATA
-export INSTALL_SCRIPT
-export INSTALL_PROGRAM
-
-m4_divert(-1)m4_dnl
-
-m4_changequote([,])
-
-m4_define([build], [.PHONY: [build]
-[build]:
-m4_syscmd([test -f ../configure || test -f ../config.status])m4_dnl
-m4_ifelse(m4_sysval,0,[        if test -f config.status; then \
-         ./config.status; else\
-         ./configure ${CONFIGURE} ${CONFIGURE_EXTRA}; fi
-])m4_dnl
-       $(MAKE) prefix=/usr])m4_dnl
-
-m4_define([binary], [.PHONY: [binary] [binary]-arch [binary]-indep
-[binary]: [binary]-arch [binary]-indep
-[binary]-arch: _archpkgs
-[binary]-indep: _indeppkgs])
-
-m4_define([anypkg], [m4_define([_package], $1)m4_dnl
-m4_define([cleanup], cleanup [cleanpkg-$1])m4_dnl
-.PHONY: cleanpkg-$1
-cleanpkg-$1:
-       rm -rf debian/$1
-
-.PHONY: pkg-$1
-pkg-$1: [build]
-       rm -rf debian/$1
-       $(MKDIR) debian/$1
-       $(MKDIR) debian/$1/DEBIAN
-       $(MKDIR) debian/$1/usr/share/doc/$1
-       $(INSTALL_DATA) debian/copyright \
-               debian/$1/usr/share/doc/$1/copyright
-       $(INSTALL_DATA) debian/changelog \
-               debian/$1/usr/share/doc/$1/changelog.Debian
-       gzip -9 debian/$1/usr/share/doc/$1/changelog.Debian
-       @for f in preinst postinst prerm postrm conffiles templates config; do\
-         if test -e debian/$$f.$1; then\
-           echo $(INSTALL_SCRIPT) debian/$$f.$1 debian/$1/DEBIAN/$$f; \
-           $(INSTALL_SCRIPT) debian/$$f.$1 debian/$1/DEBIAN/$$f; \
-         fi;\
-       done
-$2     dpkg-gencontrol -isp -p$1 -Pdebian/$1 -Tdebian/substvars.$1
-       chown -R root:root debian/$1
-       chmod -R g-ws debian/$1
-       dpkg --[build] debian/$1 ..
-])
-
-m4_define([_target],
-       [m4_ifelse([$2],[],[$1],[$2])])
-
-m4_define([install_usrbin],
-        [$(INSTALL) -m 755 $1 \
-               debian/_package/usr/bin/_target([$1],[$2])])
-
-m4_define([install_usrsbin],
-        [$(INSTALL) -m 755 $1 \
-               debian/_package/usr/sbin/_target([$1],[$2])])
-
-m4_define([install_bin],
-        [$(INSTALL) -m 755 $1 \
-               debian/_package/bin/_target([$1],[$2])])
-
-m4_define([install_sbin],
-        [$(INSTALL) -m 755 $1 \
-               debian/_package/sbin/_target([$1],[$2])])
-
-m4_define([_mansect],
-       [m4_patsubst([$1], [^.*\.\([^.]*\)], [\1])])
-
-m4_define([install_usrman],
-       [$(INSTALL) -m 644 $1 \
-               debian/_package/usr/share/man/man[]_mansect(_target([$1],[$2]))/_target([$1],[$2])
-       gzip -9 debian/_package/usr/share/man/man[]_mansect(_target([$1],[$2]))/_target([$1],[$2])])
-
-m4_define([install_manlink],
-       [ln -s ../man[]_mansect([$1])/$1.gz \
-               debian/_package/usr/man/man[]_mansect([$2])/$2.gz])
-
-m4_define([archpkg], [m4_define([_archpkgs], _archpkgs pkg-$1)m4_dnl
-anypkg([$1],[$2])])
-
-m4_define([indeppkg], [m4_define([_indeppkgs], _indeppkgs pkg-$1)m4_dnl
-anypkg([$1],[$2])])
-
-m4_define([clean], [.PHONY: [clean]
-[clean]: cleanup
-       -$(MAKE) distclean
-       rm -f config.cache
-       rm -f debian/files
-       rm -f debian/substvars.*])
-
-m4_define([cleanup], [])
-
-m4_define([_archpkgs], [])
-
-m4_define([_indeppkgs], [])
-
-m4_define([regenerate], [debian/rules: debian/autorules.m4 debian/rules.m4
-       rm -f debian/rules.tmp
-       cd debian && \
-               m4 -P autorules.m4 rules.m4 > rules.tmp
-       chmod 555 debian/rules.tmp
-       mv -f debian/rules.tmp debian/rules
-])
-
-m4_divert(0)m4_dnl

diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..ac22a29
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,286 @@
+#! /usr/bin/make -f
+#
+# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+#
+
+# Options to configure.  This can be overridden by the caller if necessary.
+CONFIGURE=--prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --mandir=/usr/share/man
+
+# Set DEB_BUILD_OPTIONS=noopt to produce a non-optimized build.
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS=-O0 -g
+else
+CFLAGS=-O2 -g
+endif
+export CFLAGS
+
+# Install commands.  You wouldn't normally override these.
+INSTALL=install
+INSTALL_DATA=$(INSTALL) -p -o root -g root -m 644
+INSTALL_PROGRAM=$(INSTALL) -p -o root -g root -m 755
+INSTALL_SCRIPT=$(INSTALL) -p -o root -g root -m 755
+MKDIR=mkdir -p -m 755
+
+# Set DEB_BUILD_OPTIONS=nostrip to install debuggable executables.
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+INSTALL_PROGRAM += -s
+endif
+
+export INSTALL_DATA
+export INSTALL_SCRIPT
+export INSTALL_PROGRAM
+
+LIBTOOL=./libtool
+FAKEROOT=fakeroot
+
+.PHONY: build
+# ./prepare is the script that generates configure etc.  It only needs to be
+# run if building from a checkout rather than a tarball.
+build:
+       @if test ! -f configure; then \
+         echo ./prepare ${CONFIGURE} ${CONFIGURE_EXTRA};\
+         ./prepare ${CONFIGURE} ${CONFIGURE_EXTRA};\
+       elif test ! -f config.status; then \
+         echo ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
+         ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
+       else\
+         echo ./config.status;\
+         ./config.status;\
+       fi
+       $(MAKE)
+
+.PHONY: cleanpkg-disorder
+cleanpkg-disorder:
+       rm -rf debian/disorder
+
+.PHONY: pkg-disorder
+pkg-disorder: build
+       rm -rf debian/disorder
+       $(MKDIR) debian/disorder
+       $(MKDIR) debian/disorder/DEBIAN
+       $(MKDIR) debian/disorder/usr/share/doc/disorder
+       $(INSTALL_DATA) debian/copyright \
+               debian/disorder/usr/share/doc/disorder/copyright
+       $(INSTALL_DATA) debian/changelog \
+               debian/disorder/usr/share/doc/disorder/changelog.Debian
+       gzip -9 debian/disorder/usr/share/doc/disorder/changelog.Debian
+       @for f in preinst postinst prerm postrm conffiles templates config; do\
+         if test -e debian/$$f.disorder; then\
+           echo $(INSTALL_SCRIPT) debian/$$f.disorder debian/disorder/DEBIAN/$$f; \
+           $(INSTALL_SCRIPT) debian/$$f.disorder debian/disorder/DEBIAN/$$f; \
+         fi;\
+       done
+       $(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C doc
+       $(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C clients
+       $(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C lib
+       $(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C scripts
+       rm -rf debian/disorder/usr/share/man/man8
+       rm -rf debian/disorder/usr/share/disorder/*.html
+       rm -f debian/disorder/usr/bin/disorder-playrtp
+       rm -f debian/disorder/usr/bin/disobedience
+       rm -f debian/disorder/usr/share/man/man1/disorder-playrtp.1
+       rm -f debian/disorder/usr/share/man/man1/disobedience.1
+       $(MKDIR) debian/disorder/etc/disorder
+       dpkg-shlibdeps -Tdebian/substvars.disorder \
+               debian/disorder/usr/bin/*
+       $(INSTALL_DATA) CHANGES README debian/README.Debian \
+               BUGS README.* \
+               debian/disorder/usr/share/doc/disorder/.
+       bzr log > debian/disorder/usr/share/doc/disorder/changelog
+       gzip -9f debian/disorder/usr/share/doc/disorder/changelog \
+                debian/disorder/usr/share/doc/disorder/CHANGES \
+                debian/disorder/usr/share/doc/disorder/README \
+                debian/disorder/usr/share/doc/disorder/README.* \
+                debian/disorder/usr/share/doc/disorder/BUGS \
+                debian/disorder/usr/share/man/man*/*
+       dpkg-gencontrol -isp -pdisorder -Pdebian/disorder -Tdebian/substvars.disorder
+       chown -R root:root debian/disorder
+       chmod -R g-ws debian/disorder
+       dpkg --build debian/disorder ..
+
+
+.PHONY: cleanpkg-disorder-server
+cleanpkg-disorder-server:
+       rm -rf debian/disorder-server
+
+.PHONY: pkg-disorder-server
+pkg-disorder-server: build
+       rm -rf debian/disorder-server
+       $(MKDIR) debian/disorder-server
+       $(MKDIR) debian/disorder-server/DEBIAN
+       $(MKDIR) debian/disorder-server/usr/share/doc/disorder-server
+       $(INSTALL_DATA) debian/copyright \
+               debian/disorder-server/usr/share/doc/disorder-server/copyright
+       $(INSTALL_DATA) debian/changelog \
+               debian/disorder-server/usr/share/doc/disorder-server/changelog.Debian
+       gzip -9 debian/disorder-server/usr/share/doc/disorder-server/changelog.Debian
+       @for f in preinst postinst prerm postrm conffiles templates config; do\
+         if test -e debian/$$f.disorder-server; then\
+           echo $(INSTALL_SCRIPT) debian/$$f.disorder-server debian/disorder-server/DEBIAN/$$f; \
+           $(INSTALL_SCRIPT) debian/$$f.disorder-server debian/disorder-server/DEBIAN/$$f; \
+         fi;\
+       done
+       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C images
+       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C server
+       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C templates
+       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C driver
+       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C plugins
+       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C sounds
+       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C doc
+       rm -rf debian/disorder-server/usr/share/man/man1
+       rm -rf debian/disorder-server/usr/share/man/man3
+       rm -rf debian/disorder-server/usr/share/man/man5
+       $(MKDIR) debian/disorder-server/etc/disorder
+       $(MKDIR) debian/disorder-server/etc/init.d
+       $(MKDIR) debian/disorder-server/usr/lib/cgi-bin/disorder
+       $(MKDIR) debian/disorder-server/var/lib/disorder
+       $(INSTALL_SCRIPT) examples/disorder.init \
+               debian/disorder-server/etc/init.d/disorder
+       $(INSTALL_DATA) debian/etc.disorder.config \
+               debian/disorder-server/etc/disorder/config
+       $(INSTALL_DATA) debian/etc.disorder.options \
+               debian/disorder-server/etc/disorder/options
+       $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) server/disorder.cgi \
+               $(shell pwd)/debian/disorder-server/usr/lib/cgi-bin/disorder/disorder
+       dpkg-shlibdeps -Tdebian/substvars.disorder-server \
+               debian/disorder-server/usr/lib/cgi-bin/disorder/* \
+               debian/disorder-server/usr/sbin/* \
+               debian/disorder-server/usr/lib/disorder/*.so*
+       $(INSTALL_DATA) debian/htaccess \
+               debian/disorder-server/usr/lib/cgi-bin/disorder/.htaccess
+       rm -rf debian/disorder-server/usr/share/doc/disorder-server
+       ln -s disorder debian/disorder-server/usr/share/doc/disorder-server
+       dpkg-gencontrol -isp -pdisorder-server -Pdebian/disorder-server -Tdebian/substvars.disorder-server
+       chown -R root:root debian/disorder-server
+       chmod -R g-ws debian/disorder-server
+       dpkg --build debian/disorder-server ..
+
+
+.PHONY: cleanpkg-disorder-playrtp
+cleanpkg-disorder-playrtp:
+       rm -rf debian/disorder-playrtp
+
+.PHONY: pkg-disorder-playrtp
+pkg-disorder-playrtp: build
+       rm -rf debian/disorder-playrtp
+       $(MKDIR) debian/disorder-playrtp
+       $(MKDIR) debian/disorder-playrtp/DEBIAN
+       $(MKDIR) debian/disorder-playrtp/usr/share/doc/disorder-playrtp
+       $(INSTALL_DATA) debian/copyright \
+               debian/disorder-playrtp/usr/share/doc/disorder-playrtp/copyright
+       $(INSTALL_DATA) debian/changelog \
+               debian/disorder-playrtp/usr/share/doc/disorder-playrtp/changelog.Debian
+       gzip -9 debian/disorder-playrtp/usr/share/doc/disorder-playrtp/changelog.Debian
+       @for f in preinst postinst prerm postrm conffiles templates config; do\
+         if test -e debian/$$f.disorder-playrtp; then\
+           echo $(INSTALL_SCRIPT) debian/$$f.disorder-playrtp debian/disorder-playrtp/DEBIAN/$$f; \
+           $(INSTALL_SCRIPT) debian/$$f.disorder-playrtp debian/disorder-playrtp/DEBIAN/$$f; \
+         fi;\
+       done
+       $(MKDIR) debian/disorder-playrtp/usr/bin
+       $(MKDIR) debian/disorder-playrtp/usr/share/man/man1
+       $(INSTALL_PROGRAM) clients/disorder-playrtp \
+               debian/disorder-playrtp/usr/bin/disorder-playrtp
+       $(INSTALL_DATA) doc/disorder-playrtp.1 \
+               debian/disorder-playrtp/usr/share/man/man1/disorder-playrtp.1
+       dpkg-shlibdeps -Tdebian/substvars.disorder-playrtp \
+               debian/disorder-playrtp/usr/bin/*
+       $(INSTALL_DATA) debian/README.RTP \
+               debian/disorder-playrtp/usr/share/doc/disorder-playrtp/README
+       $(INSTALL_DATA) CHANGES debian/disorder-playrtp/usr/share/doc/disorder-playrtp/CHANGES
+       gzip -9f debian/disorder-playrtp/usr/share/doc/disorder-playrtp/CHANGES \
+                debian/disorder-playrtp/usr/share/man/man*/*
+       dpkg-gencontrol -isp -pdisorder-playrtp -Pdebian/disorder-playrtp -Tdebian/substvars.disorder-playrtp
+       chown -R root:root debian/disorder-playrtp
+       chmod -R g-ws debian/disorder-playrtp
+       dpkg --build debian/disorder-playrtp ..
+
+
+.PHONY: cleanpkg-disobedience
+cleanpkg-disobedience:
+       rm -rf debian/disobedience
+
+.PHONY: pkg-disobedience
+pkg-disobedience: build
+       rm -rf debian/disobedience
+       $(MKDIR) debian/disobedience
+       $(MKDIR) debian/disobedience/DEBIAN
+       $(MKDIR) debian/disobedience/usr/share/doc/disobedience
+       $(INSTALL_DATA) debian/copyright \
+               debian/disobedience/usr/share/doc/disobedience/copyright
+       $(INSTALL_DATA) debian/changelog \
+               debian/disobedience/usr/share/doc/disobedience/changelog.Debian
+       gzip -9 debian/disobedience/usr/share/doc/disobedience/changelog.Debian
+       @for f in preinst postinst prerm postrm conffiles templates config; do\
+         if test -e debian/$$f.disobedience; then\
+           echo $(INSTALL_SCRIPT) debian/$$f.disobedience debian/disobedience/DEBIAN/$$f; \
+           $(INSTALL_SCRIPT) debian/$$f.disobedience debian/disobedience/DEBIAN/$$f; \
+         fi;\
+       done
+       $(MKDIR) debian/disobedience/usr/bin
+       $(MKDIR) debian/disobedience/usr/share/man/man1
+       $(MKDIR) debian/disobedience/usr/share/pixmaps
+       $(MKDIR) debian/disobedience/usr/share/menu
+       $(MAKE) -C disobedience install DESTDIR=`pwd`/debian/disobedience
+       $(INSTALL_DATA) doc/disobedience.1 \
+               debian/disobedience/usr/share/man/man1/disobedience.1
+       $(INSTALL_DATA) images/disobedience16x16.xpm \
+                       images/disobedience32x32.xpm \
+                       debian/disobedience/usr/share/pixmaps
+       $(INSTALL_DATA) debian/usr.share.menu.disobedience \
+               debian/disobedience/usr/share/menu/disobedience
+       dpkg-shlibdeps -Tdebian/substvars.disobedience \
+               debian/disobedience/usr/bin/*
+       rm -rf debian/disobedience/usr/share/doc/disobedience
+       ln -s disorder debian/disobedience/usr/share/doc/disobedience
+       dpkg-gencontrol -isp -pdisobedience -Pdebian/disobedience -Tdebian/substvars.disobedience
+       chown -R root:root debian/disobedience
+       chmod -R g-ws debian/disobedience
+       dpkg --build debian/disobedience ..
+
+
+DEBVERSION:=$(shell dpkg-parsechangelog|awk '/Version:/ {print $$2}')
+DSC=disorder_$(DEBVERSION).dsc
+DEBSRC=disorder_$(DEBVERSION).tar.gz
+VERSION=$(shell $(MAKE) echo-version)
+
+source:
+       $(MAKE) dist
+       rm -rf disorder-$(VERSION)
+       tar xfz disorder-$(VERSION).tar.gz
+       dpkg-source -b disorder-$(VERSION)
+       rm -rf disorder-$(VERSION) disorder-$(VERSION).tar.gz
+
+source-check: source
+       rm -rf disorder-$(DEBVERSION)
+       dpkg-source -x $(DSC)
+       cd disorder-$(DEBVERSION) && dpkg-buildpackage -r$(FAKEROOT)
+
+.PHONY: source source-check
+
+.PHONY: binary binary-arch binary-indep
+binary: binary-arch binary-indep
+binary-arch:  pkg-disorder pkg-disorder-server pkg-disorder-playrtp pkg-disobedience
+binary-indep: 
+
+.PHONY: clean
+clean:  cleanpkg-disorder cleanpkg-disorder-server cleanpkg-disorder-playrtp cleanpkg-disobedience
+       -$(MAKE) distclean
+       rm -f config.cache
+       rm -f debian/files
+       rm -f debian/substvars.*

diff --git a/debian/rules.m4 b/debian/rules.m4
deleted file mode 100644 (file)
index 7e92aca..0000000
--- a/debian/rules.m4
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-# This file is part of DisOrder.
-# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
-#
-
-CONFIGURE=--prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --mandir=/usr/share/man
-LIBTOOL=./libtool
-FAKEROOT=fakeroot
-
-build
-
-archpkg([disorder], [  m4_dnl
-       $(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C doc
-       $(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C clients
-       $(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C lib
-       $(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C scripts
-       rm -rf debian/disorder/usr/share/man/man8
-       rm -rf debian/disorder/usr/share/disorder/*.html
-       rm -f debian/disorder/usr/bin/disorder-playrtp
-       rm -f debian/disorder/usr/bin/disobedience
-       rm -f debian/disorder/usr/share/man/man1/disorder-playrtp.1
-       rm -f debian/disorder/usr/share/man/man1/disobedience.1
-       $(MKDIR) debian/disorder/etc/disorder
-       dpkg-shlibdeps -Tdebian/substvars.disorder \
-               debian/disorder/usr/bin/*
-       $(INSTALL_DATA) CHANGES README debian/README.Debian \
-               BUGS README.* \
-               debian/disorder/usr/share/doc/disorder/.
-       bzr log > debian/disorder/usr/share/doc/disorder/changelog
-       gzip -9f debian/disorder/usr/share/doc/disorder/changelog \
-                debian/disorder/usr/share/doc/disorder/CHANGES \
-                debian/disorder/usr/share/doc/disorder/README \
-                debian/disorder/usr/share/doc/disorder/README.* \
-                debian/disorder/usr/share/doc/disorder/BUGS \
-                debian/disorder/usr/share/man/man*/*
-])
-
-archpkg([disorder-server], [   m4_dnl
-       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C images
-       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C server
-       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C templates
-       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C driver
-       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C plugins
-       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C sounds
-       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C doc
-       rm -rf debian/disorder-server/usr/share/man/man1
-       rm -rf debian/disorder-server/usr/share/man/man3
-       rm -rf debian/disorder-server/usr/share/man/man5
-       $(MKDIR) debian/disorder-server/etc/disorder
-       $(MKDIR) debian/disorder-server/etc/init.d
-       $(MKDIR) debian/disorder-server/usr/lib/cgi-bin/disorder
-       $(MKDIR) debian/disorder-server/var/lib/disorder
-       $(INSTALL_SCRIPT) examples/disorder.init \
-               debian/disorder-server/etc/init.d/disorder
-       $(INSTALL_DATA) debian/etc.disorder.config \
-               debian/disorder-server/etc/disorder/config
-       $(INSTALL_DATA) debian/etc.disorder.options \
-               debian/disorder-server/etc/disorder/options
-       $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) server/disorder.cgi \
-               $(shell pwd)/debian/disorder-server/usr/lib/cgi-bin/disorder/disorder
-       dpkg-shlibdeps -Tdebian/substvars.disorder-server \
-               debian/disorder-server/usr/lib/cgi-bin/disorder/* \
-               debian/disorder-server/usr/sbin/* \
-               debian/disorder-server/usr/lib/disorder/*.so*
-       $(INSTALL_DATA) debian/htaccess \
-               debian/disorder-server/usr/lib/cgi-bin/disorder/.htaccess
-       rm -rf debian/disorder-server/usr/share/doc/disorder-server
-       ln -s disorder debian/disorder-server/usr/share/doc/disorder-server
-])
-
-archpkg([disorder-playrtp], [  m4_dnl
-       $(MKDIR) debian/disorder-playrtp/usr/bin
-       $(MKDIR) debian/disorder-playrtp/usr/share/man/man1
-       $(INSTALL_PROGRAM) clients/disorder-playrtp \
-               debian/disorder-playrtp/usr/bin/disorder-playrtp
-       $(INSTALL_DATA) doc/disorder-playrtp.1 \
-               debian/disorder-playrtp/usr/share/man/man1/disorder-playrtp.1
-       dpkg-shlibdeps -Tdebian/substvars.disorder-playrtp \
-               debian/disorder-playrtp/usr/bin/*
-       $(INSTALL_DATA) debian/README.RTP \
-               debian/disorder-playrtp/usr/share/doc/disorder-playrtp/README
-       $(INSTALL_DATA) CHANGES debian/disorder-playrtp/usr/share/doc/disorder-playrtp/CHANGES
-       gzip -9f debian/disorder-playrtp/usr/share/doc/disorder-playrtp/CHANGES \
-                debian/disorder-playrtp/usr/share/man/man*/*
-])
-
-archpkg([disobedience], [      m4_dnl
-       $(MKDIR) debian/disobedience/usr/bin
-       $(MKDIR) debian/disobedience/usr/share/man/man1
-       $(MKDIR) debian/disobedience/usr/share/pixmaps
-       $(MKDIR) debian/disobedience/usr/share/menu
-       $(MAKE) -C disobedience install DESTDIR=`pwd`/debian/disobedience
-       $(INSTALL_DATA) doc/disobedience.1 \
-               debian/disobedience/usr/share/man/man1/disobedience.1
-       $(INSTALL_DATA) images/disobedience16x16.xpm \
-                       images/disobedience32x32.xpm \
-                       debian/disobedience/usr/share/pixmaps
-       $(INSTALL_DATA) debian/usr.share.menu.disobedience \
-               debian/disobedience/usr/share/menu/disobedience
-       dpkg-shlibdeps -Tdebian/substvars.disobedience \
-               debian/disobedience/usr/bin/*
-       rm -rf debian/disobedience/usr/share/doc/disobedience
-       ln -s disorder debian/disobedience/usr/share/doc/disobedience
-])
-
-DEBVERSION:=$(shell dpkg-parsechangelog|awk '/Version:/ {print $$2}')
-DSC:=disorder_$(DEBVERSION).dsc
-DEBSRC:=disorder_$(DEBVERSION).tar.gz
-VERSION:=$(shell $(MAKE) echo-version)
-
-source:
-       $(MAKE) dist
-       rm -rf disorder-$(VERSION)
-       tar xfz disorder-$(VERSION).tar.gz
-       dpkg-source -b disorder-$(VERSION)
-       rm -rf disorder-$(VERSION) disorder-$(VERSION).tar.gz
-
-source-check: source
-       rm -rf disorder-$(DEBVERSION)
-       dpkg-source -x $(DSC)
-       cd disorder-$(DEBVERSION) && dpkg-buildpackage -r$(FAKEROOT)
-
-.PHONY: source source-check
-
-binary
-
-clean
-
-regenerate