[SCM] vlc/master: Disable building a static library.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 313c64a2542ff7fbb6b7d5934881c5ad12a04a57
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Oct 8 00:20:21 2013 +0200

    Disable building a static library.

diff --git a/debian/libvlc-dev.install b/debian/libvlc-dev.install
index 20021ad..33d8b2f 100644
--- a/debian/libvlc-dev.install
+++ b/debian/libvlc-dev.install
@@ -1,4 +1,3 @@
 usr/include/vlc/*.h
-usr/lib/libvlc.a
 usr/lib/libvlc.so
 usr/lib/pkgconfig/libvlc.pc
diff --git a/debian/libvlccore-dev.install b/debian/libvlccore-dev.install
index ff0b576..f8ef3bb 100644
--- a/debian/libvlccore-dev.install
+++ b/debian/libvlccore-dev.install
@@ -1,5 +1,4 @@
 usr/include/vlc/plugins/*.h
-usr/lib/libvlccore.a
 usr/lib/libvlccore.so
 usr/lib/pkgconfig/vlc-plugin.pc
 usr/lib/vlc/libcompat.a
diff --git a/debian/rules b/debian/rules
index 6df3d4b..a3c67a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -211,20 +211,9 @@ override_dh_autoreconf:
 
 override_dh_auto_clean:
 	[ ! -f debian/vlc-nox.install.bak ] || mv -f debian/vlc-nox.install.bak debian/vlc-nox.install
-	rm -rf tmp/
 	dh_auto_clean
 
 override_dh_auto_configure:
-	# We need to build the static library apart
-	# Else it's a mess when we build the modules
-	./configure --enable-static $(confflags)
-	$(MAKE) -C compat
-	$(MAKE) -C src libvlccore.la
-	$(MAKE) -C lib libvlc.la
-	mkdir -p tmp
-	cp src/.libs/libvlccore.a tmp/libvlccore.a
-	cp lib/.libs/libvlc.a tmp/libvlc.a
-	$(MAKE) distclean
 	dh_auto_configure -- $(confflags)
 
 override_dh_auto_test:
@@ -245,8 +234,6 @@ override_dh_install:
 	# Remove disabled plugins
 	test -f debian/vlc-nox.install.bak || cp debian/vlc-nox.install debian/vlc-nox.install.bak
 	sed -i "/\($(shell echo $(removeplugins) | sed 's/ /\\|/g')\)_/d" debian/vlc-nox.install
-	cp tmp/libvlc.a debian/tmp/usr/lib
-	cp tmp/libvlccore.a debian/tmp/usr/lib
 	# Clean up libtool crap
 	find debian/tmp -name '*.la' -delete
 	# Remove useless stuff

-- 
VLC media player packaging