r1133 - /experimental/ffmpeg/debian/rules

[siretart at users.alioth.debian.org]

Author: siretart
Date: Fri Apr 18 20:48:48 2008
New Revision: 1133

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1133
Log:
further cleanup of debian/rules: collect configure flags for shared and static build in own variables

Modified:
    experimental/ffmpeg/debian/rules

Modified: experimental/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/rules?rev=1133&op=diff
==============================================================================
--- experimental/ffmpeg/debian/rules (original)
+++ experimental/ffmpeg/debian/rules Fri Apr 18 20:48:48 2008
@@ -10,8 +10,10 @@
 confflags += --enable-pthreads
 confflags += --enable-libvorbis --enable-libtheora
 confflags += --enable-libgsm
-# Disable all architecture-specific optimizations
-confflags += --disable-mmx --disable-armv5te --disable-armv6 --disable-iwmmxt --disable-altivec
+
+# Disable architecture-specific optimizations for shared build
+nooptflags += --disable-armv5te --disable-armv6 --disable-iwmmxt --disable-altivec
+nooptflags += --disable-mmx
 
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: //p')
 SRC_VERSION := $(shell echo $(DEB_VERSION) | cut -d '-' -f 1)
@@ -53,6 +55,12 @@
   $(warning Make sure these packages are installed: $(weak-build-deps))
 endif
 
+static_build_confflags = $(confflags) --disable-ffmpeg --disable-vhook \
+	--disable-ffserver --disable-ffplay --prefix=/usr
+
+shared_build_confflags = $(confflags) $(nooptflags) --enable-shared \
+	--prefix=/usr --extra-cflags="-fPIC -DPIC"
+
 config-extra-includes.h:
 	sh debian/fixup-config.sh > config-extra-includes.h
 
@@ -62,7 +70,7 @@
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 
 	# Build static libraries
-	./configure $(confflags) --disable-ffmpeg --disable-vhook --disable-ffserver --disable-ffplay --prefix=/usr
+	./configure $(static_build_confflags)
 ifeq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
 	echo "#include \"config-extra-includes.h\"" >> config.h
 endif
@@ -76,7 +84,7 @@
 	$(MAKE) clean
 
 	# Build ffmpeg and shared libraries
-	./configure $(confflags) --enable-shared --prefix=/usr --extra-cflags="-fPIC -DPIC"
+	./configure $(shared_build_confflags)
 ifeq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
 	echo "#include \"config-extra-includes.h\"" >> config.h
 endif