r1261 - /unstable/ffmpeg/debian/rules

[fabian-guest at users.alioth.debian.org]

Author: fabian-guest
Date: Thu Jun 19 08:28:22 2008
New Revision: 1261

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1261
Log:
Clean up debian/rules even more

Modified:
    unstable/ffmpeg/debian/rules

Modified: unstable/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/rules?rev=1261&op=diff
==============================================================================
--- unstable/ffmpeg/debian/rules (original)
+++ unstable/ffmpeg/debian/rules Thu Jun 19 08:28:22 2008
@@ -5,40 +5,55 @@
 #export DH_VERBOSE=1
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 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
+export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+DEB_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: //p')
+SRC_VERSION := $(shell echo $(DEB_VERSION) | cut -d '-' -f 1)
+SVN_VERSION := $(shell echo $(SRC_VERSION) | sed -ne 's/^[0-9]\.[a-z]*//p')
+
+LIBS := libavutil libavcodec libpostproc libavformat libavdevice libswscale
+
+# Support multiple makes at once (taken from the qemu package)
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-NJOBS := $(patsubst parallel=%,%,$(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-pp --enable-x11grab
-gpl_confflags += --enable-liba52 --enable-libfaad
+  NJOBS := 1
+endif
+
+# Comment out the following lines for LGPL versions of the libraries
+gpl_confflags := --enable-gpl
+gpl_confflags += --enable-liba52
+gpl_confflags += --enable-libfaad
+gpl_confflags += --enable-pp
+gpl_confflags += --enable-x11grab
 
 # Common configuration flags
 confflags := $(gpl_confflags)
+confflags += --prefix=/usr
+confflags += --enable-libgsm
+confflags += --enable-libtheora
+confflags += --enable-libvorbis
+confflags += --enable-pthreads
 confflags += --enable-swscaler
-confflags += --prefix=/usr
-confflags += --enable-pthreads
-confflags += --enable-libvorbis
-confflags += --enable-libtheora
-confflags += --enable-libgsm
 confflags += --disable-strip
-
 
 # Disable architecture-specific optimizations for shared build
 nooptflags += --disable-armv5te --disable-armv6 --disable-iwmmxt
 nooptflags += --disable-mmx
 nooptflags += --disable-altivec
 
-DEB_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: //p')
-SRC_VERSION := $(shell echo $(DEB_VERSION) | cut -d '-' -f 1)
-SVN_VERSION := $(shell echo $(SRC_VERSION) | sed -ne 's/^[0-9]\.[a-z]*//p')
+# Configuration flags for the static libraries
+static_build_confflags := $(confflags)
+static_build_confflags += --disable-ffmpeg
+static_build_confflags += --disable-vhook
+static_build_confflags += --disable-ffserver
+static_build_confflags += --disable-ffplay
+
+# Configuration flags for the non-optimized shared libraries
+shared_build_confflags := $(confflags)
+shared_build_confflags += $(nooptflags)
+shared_build_confflags += --enable-shared
+shared_build_confflags += --extra-cflags="-fPIC -DPIC"
 
 ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
   confflags += --enable-libdc1394
@@ -59,8 +74,8 @@
 endif
 
 ifneq (,$(findstring externalcodecs,$(DEB_BUILD_OPTIONS)))
-# Uncomment the following lines to allow use of nonfree code.
-# The resulting packages will be unredistributable!
+# Uncomment the following lines to allow the use of nonfree code,
+# the resulting packages will be unredistributable!
 # weak-build-deps += libamrnb-dev
 # confflags += --enable-nonfree --enable-libamr-nb
 # weak-build-deps += libamrwb-dev
@@ -76,12 +91,6 @@
   $(warning Make sure these packages are installed: $(weak-build-deps))
 endif
 
-static_build_confflags = $(confflags) --disable-ffmpeg --disable-vhook \
-	--disable-ffserver --disable-ffplay
-
-shared_build_confflags = $(confflags) $(nooptflags) --enable-shared \
-	--extra-cflags="-fPIC -DPIC"
-
 config-extra-includes.h:
 	sh debian/fixup-config.sh > config-extra-includes.h
 
@@ -91,9 +100,11 @@
 
 	# Build static libraries
 	./configure $(static_build_confflags)
+
 ifeq (,$(findstring internalencoders,$(DEB_BUILD_OPTIONS)))
 	echo "#include \"config-extra-includes.h\"" >> config.h
 endif
+
 	$(MAKE) -j $(NJOBS)
 
 	# Backup static libraries
@@ -105,9 +116,11 @@
 
 	# Build ffmpeg and shared libraries
 	./configure $(shared_build_confflags)
+
 ifeq (,$(findstring internalencoders,$(DEB_BUILD_OPTIONS)))
 	echo "#include \"config-extra-includes.h\"" >> config.h
 endif
+
 	$(MAKE) -j $(NJOBS)
 
 	# Restore static libraries and fix timestamps
@@ -142,6 +155,7 @@
 
 get-orig-source:
 	dh_testdir
+
 ifeq (,$(findstring internalencoders,$(DEB_BUILD_OPTIONS)))
         # Disable potentially dangerous patented code
 	chmod +x debian/strip.sh
@@ -179,11 +193,8 @@
 
 	dh_install --fail-missing --sourcedir=debian/tmp
 
-# Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
+
 binary-arch: build install
 	dh_testdir
 	dh_testroot