[vlc-commits] cosmetics: contrib: bluray: reorder and split config

[Vittorio Giovara]

vlc/vlc-2.2 | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Mon Jun 30 15:04:27 2014 -0400| [d9f45b7414161ac438baaeb15cb9b99ba757a45f] | committer: Felix Paul Kühne

cosmetics: contrib: bluray: reorder and split config

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
(cherry picked from commit 2511f822b244371c7dd5776166917db80e7a1486)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=d9f45b7414161ac438baaeb15cb9b99ba757a45f
---

 contrib/src/bluray/rules.mak |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/contrib/src/bluray/rules.mak b/contrib/src/bluray/rules.mak
index ff26534..157a1c0 100644
--- a/contrib/src/bluray/rules.mak
+++ b/contrib/src/bluray/rules.mak
@@ -1,5 +1,8 @@
 # LIBBLURAY
 
+BLURAY_VERSION := 0.6.0
+BLURAY_URL := http://ftp.videolan.org/pub/videolan/libbluray/$(BLURAY_VERSION)/libbluray-$(BLURAY_VERSION).tar.bz2
+
 ifdef BUILD_DISCS
 PKGS += bluray
 endif
@@ -9,8 +12,10 @@ endif
 
 DEPS_bluray = libxml2 $(DEPS_libxml2)
 
-BLURAY_VERSION := 0.6.0
-BLURAY_URL := http://ftp.videolan.org/pub/videolan/libbluray/$(BLURAY_VERSION)/libbluray-$(BLURAY_VERSION).tar.bz2
+BLURAY_CONF = --disable-examples  \
+              --disable-debug     \
+              --enable-libxml2    \
+              --enable-bdjava
 
 $(TARBALLS)/libbluray-$(BLURAY_VERSION).tar.bz2:
 	$(call download,$(BLURAY_URL))
@@ -23,6 +28,6 @@ bluray: libbluray-$(BLURAY_VERSION).tar.bz2 .sum-bluray
 
 .bluray: bluray
 	cd $< && ./bootstrap
-	cd $< && $(HOSTVARS) ./configure --disable-examples --disable-debug --enable-libxml2 --enable-bdjava $(HOSTCONF)
+	cd $< && $(HOSTVARS) ./configure $(BLURAY_CONF) $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@