Merge from 1.1.

--HG--
rename : include/xine.h.in => include/xine.h

1 files changed, 19 insertions, 6 deletions

diff --git a/debian/rules b/debian/rules
index 96dce1aa0..b2894e584 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,18 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	BUILD_TARGET := debug
 endif
 
+ifneq (,$(findstring mips,$(DEB_HOST_GNU_TYPE)))
+	DEB_BUILD_CONFIG_OPTIONS += PTHREAD_LIBS="-lpthread"
+endif
+
+# taken from the qemu package
+# Support multiple makes at once
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+else
+NJOBS := 1
+endif
+
 # note also "noauto" to inhibit running of autogen.sh
 
 # the "optimize" flag disables compatibility hacks
@@ -67,6 +79,7 @@ CONFIGURE_FLAGS := --prefix=/usr \
 	--with-external-ffmpeg=soft \
 	--with-freetype \
 	--with-wavpack \
+	--enable-ipv6 \
 	$(DEB_BUILD_CONFIG_OPTIONS) \
 	CFLAGS="$(CFLAGS)"
 
@@ -87,7 +100,7 @@ endif
 build: configure-stamp build-stamp
 build-stamp:
 	dh_testdir
-	$(MAKE)
+	$(MAKE) -j $(NJOBS)
 	touch build-stamp
 
 update-config-sub-guess:
@@ -100,11 +113,11 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp po/*.gmo po/stamp-po
-	-$(MAKE) distclean
-	# remove more cruft leftover by autohell
-	rm -f doc/faq/faq.html doc/faq/faq.txt doc/hackersguide/hackersguide.html m4/caca.m4
-	-test -f .noauto || find . -name Makefile.in -print | xargs -r rm
-	test -f .noauto || rm -rf compile config.guess configure depcomp install-sh ltmain.sh missing aclocal.m4 include/configure.h.in
+	if test -f .noauto; then \
+	    [ ! -f Makefile ] || $(MAKE) distclean; \
+	  else \
+	    [ ! -f Makefile ] || $(MAKE) maintainer-clean; \
+	  fi
 	dh_clean
 
 install: build