[vlc-commits] contrib: dvdnav: disable examples using configure option

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu Oct 18 19:34:20 2012 +0200| [938d93aa3d958236ff4929a2d2102557fa1d3581] | committer: Rafaël Carré

contrib: dvdnav: disable examples using configure option

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

 contrib/src/dvdnav/dvdnav.patch |   12 ------------
 contrib/src/dvdnav/rules.mak    |    3 +--
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/contrib/src/dvdnav/dvdnav.patch b/contrib/src/dvdnav/dvdnav.patch
deleted file mode 100644
index 6f42dc3..0000000
--- a/contrib/src/dvdnav/dvdnav.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN libdvdnav/Makefile.am libdvdnav.new/Makefile.am
---- libdvdnav/Makefile.am	2008-06-18 17:06:33.000000000 +0200
-+++ libdvdnav.new/Makefile.am	2011-10-11 01:02:18.768524699 +0200
-@@ -1,7 +1,7 @@
- include $(top_srcdir)/misc/Makefile.common
- 
- 
--SUBDIRS = src examples doc misc m4
-+SUBDIRS = src misc m4
- 
- EXTRA_DIST = autogen.sh \
- 	     AUTHORS \
diff --git a/contrib/src/dvdnav/rules.mak b/contrib/src/dvdnav/rules.mak
index 663c85d..a579724 100644
--- a/contrib/src/dvdnav/rules.mak
+++ b/contrib/src/dvdnav/rules.mak
@@ -24,13 +24,12 @@ $(TARBALLS)/libdvdnav-git.tar.xz:
 
 dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.xz .sum-dvdnav
 	$(UNPACK)
-	$(APPLY) $(SRC)/dvdnav/dvdnav.patch
 	$(MOVE)
 
 DEPS_dvdnav = dvdcss dvdread
 
 .dvdnav: dvdnav .dvdcss .dvdread
 	cd $< && sh autogen.sh noconfig
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-examples
 	cd $< && $(MAKE) install
 	touch $@