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

[lool at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit d2e3a71736e551f8f7f4af5816613e80f0c35ae4
Author: Loïc Minier <lool at dooz.org>
Date:   Sun Feb 21 13:00:41 2010 +0100

    Split confflags logic in debian/confflags

diff --git a/debian/confflags b/debian/confflags
new file mode 100644
index 0000000..effe940
--- /dev/null
+++ b/debian/confflags
@@ -0,0 +1,19 @@
+# configure flags logic
+
+common_confflags += \
+	--enable-pthread \
+	--prefix=/usr \
+	--enable-debug
+
+static_confflags += \
+	$(common_confflags)
+
+# 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
+
+# vi:syntax=make
diff --git a/debian/rules b/debian/rules
index 27e951f..02bc5d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,11 +10,7 @@ PARALLEL_FLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j$(DEB_BUILD_OPTIONS_PARAL
 # will affect concurrency of debian/rules as well
 MAKEFLAGS += $(PARALLEL_FLAGS)
 
-common_confflags = --enable-pthread --prefix=/usr --enable-debug
-static_confflags = $(common_confflags)
-# 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
+include debian/confflags
 
 CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 LDFLAGS += -Wl,--as-needed

-- 
x264 packaging