[SCM] x264 packaging branch, ubuntu, updated. debian/0.85.1442.1+git781d30-1-8-g39cb705

[lool at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 7ec32f0224df2c14e2dbb4c57ef9f89693867093
Author: Loïc Minier <lool at dooz.org>
Date:   Sun Feb 21 11:36:51 2010 +0100

    Use shared_ and static_confflags vars

diff --git a/debian/rules b/debian/rules
index e9120d6..e5dc3b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,11 @@ ifeq ($(NCPUS),0)
 	NCPUS:=1
 endif
 
-confflags = --enable-pthread --prefix=/usr --enable-debug
+common_confflags = --enable-pthread --prefix=/usr --enable-debug
+static_confflags = $(common_confflags) --disable-shared
+# TODO disable PIC on i386 for performance?
+# XXX why is --enable-visualize only used in the shared build?
+shared_confflags = $(common_confflags) --enable-shared --enable-pic --enable-visualize
 
 CFLAGS = -Wall -g
 LDFLAGS = -Wl,--as-needed
@@ -42,7 +46,7 @@ build-stamp: debian/stamp-patched
 	chmod +x version.sh
 
 	# Build static lib
-	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure $(confflags)
+	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure $(static_confflags)
 	$(MAKE) -j $(NCPUS) libx264.a
 
 	# Backup static lib
@@ -51,10 +55,7 @@ build-stamp: debian/stamp-patched
 	# Build shared lib
 	$(MAKE) clean
 
-	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure $(confflags) --enable-shared \
-	--enable-pic --enable-visualize
-
-
+	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure $(shared_confflags)
 	$(MAKE) -j $(NCPUS)
 
 	# Restore static lib

-- 
x264 packaging