r1229 - in /unstable/ffmpeg/debian: ./ changelog rules

[siretart at users.alioth.debian.org]

Author: siretart
Date: Tue Jun  3 19:28:28 2008
New Revision: 1229

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1229
Log:
* support building in paralell. make snippet taken from the qemu package.

Modified:
    unstable/ffmpeg/debian/   (props changed)
    unstable/ffmpeg/debian/changelog
    unstable/ffmpeg/debian/rules

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Tue Jun  3 19:28:28 2008
@@ -1,1 +1,2 @@
 25 siretart at tauware.de-20080603151429-63o3ag2pl1pxd47p
+26 siretart at tauware.de-20080603192817-6gi4jdk5ilh2y4w9

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Tue Jun  3 19:28:28 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-06-03 17:14:29.279999971 +0200
+timestamp: 2008-06-03 21:28:17.586999893 +0200
 committer: Reinhard Tartler <siretart at tauware.de>
 properties: 
-	branch-nick: remove.patches
+	branch-nick: trivial.fixes

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1229&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Tue Jun  3 19:28:28 2008
@@ -25,6 +25,7 @@
     So there is indeed no point in having that interface in the header file for the
     debian package. (Closes: #483960).
   * remove 011_link_plugins.diff. It is completely unnecessary now.
+  * support building in paralell. make snippet taken from the qemu package.
 
  -- Reinhard Tartler <siretart at tauware.de>  Thu, 29 May 2008 16:17:54 +0200
 

Modified: unstable/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/rules?rev=1229&op=diff
==============================================================================
--- unstable/ffmpeg/debian/rules (original)
+++ unstable/ffmpeg/debian/rules Tue Jun  3 19:28:28 2008
@@ -5,6 +5,14 @@
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 LIBS = libavutil libavcodec libpostproc libavformat libavdevice libswscale
+
+# 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
 
 # Comment out the following two lines for LGPL versions of the libraries
 gpl_confflags += --enable-gpl --enable-liba52 --enable-libfaad
@@ -88,7 +96,7 @@
 ifeq (,$(findstring internalencoders,$(DEB_BUILD_OPTIONS)))
 	echo "#include \"config-extra-includes.h\"" >> config.h
 endif
-	$(MAKE)
+	$(MAKE) -j $(NJOBS)
 
 	# Backup static libraries
 	for d in $(LIBS); do \
@@ -102,7 +110,7 @@
 ifeq (,$(findstring internalencoders,$(DEB_BUILD_OPTIONS)))
 	echo "#include \"config-extra-includes.h\"" >> config.h
 endif
-	$(MAKE)
+	$(MAKE) -j $(NJOBS)
 
 	# Restore static libraries and fix timestamps
 	for d in $(LIBS); do \