[xiph-commits] r3380 - libfishsound/branches/1.0-stable/debian

[johnf at svn.annodex.net]

Author: johnf
Date: 2008-01-23 21:26:41 -0800 (Wed, 23 Jan 2008)
New Revision: 3380

Modified:
   libfishsound/branches/1.0-stable/debian/control
   libfishsound/branches/1.0-stable/debian/rules
Log:
* Add automake as a build dependancy

Modified: libfishsound/branches/1.0-stable/debian/control
===================================================================
--- libfishsound/branches/1.0-stable/debian/control	2008-01-24 05:17:02 UTC (rev 3379)
+++ libfishsound/branches/1.0-stable/debian/control	2008-01-24 05:26:41 UTC (rev 3380)
@@ -2,7 +2,7 @@
 Section: unknown
 Priority: optional
 Maintainer: Jamie Wilkinson <jaq at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libspeex-dev, libvorbis-dev
+Build-Depends: debhelper (>> 4.0.0), libspeex-dev, libvorbis-dev, automake
 Standards-Version: 3.6.2
 
 Package: libfishsound1

Modified: libfishsound/branches/1.0-stable/debian/rules
===================================================================
--- libfishsound/branches/1.0-stable/debian/rules	2008-01-24 05:17:02 UTC (rev 3379)
+++ libfishsound/branches/1.0-stable/debian/rules	2008-01-24 05:26:41 UTC (rev 3380)
@@ -7,6 +7,8 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+CFLAGS = -Wall -g
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -28,20 +30,19 @@
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		|| cat config.log
-	touch configure-stamp
 
 build: build-stamp
 build-stamp: config.status
 	dh_testdir
 	$(MAKE)
-	-$(MAKE) check
+	$(MAKE) check
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
-	-$(MAKE) distclean
+	rm -f build-stamp
+	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f doc/manpage.refs doc/manpage.links
 	rm -f doc/libfishsound/html/*.html
 	rm -f doc/libfishsound/html/*.gif
@@ -49,10 +50,12 @@
 	rm -f doc/libfishsound/latex/doxygen.sty
 	rm -f doc/libfishsound/latex/*.tex
 	rm -f doc/fishsound-validate.1
-	-test -r /usr/share/misc/config.sub && \
-		cp -f /usr/share/misc/config.sub config.sub
-	-test -r /usr/share/misc/config.guess && \
-		cp -f /usr/share/misc/config.guess config.guess
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
 	dh_clean
 
 install: build