[vlc-commits] old contribs: remove old libebml/matroska hack
Rafaël Carré
git at videolan.org
Tue Aug 30 05:31:06 CEST 2011
vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Mon Aug 29 23:14:08 2011 -0400| [6691fa04a71f6c9d74b125d7100270458122d2b0] | committer: Rafaël Carré
old contribs: remove old libebml/matroska hack
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6691fa04a71f6c9d74b125d7100270458122d2b0
---
extras/contrib/src/contrib-src.mak | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 34447b4..f203895 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -88,13 +88,6 @@ ifeq ($(RANLIB),)
RANLIB=ranlib
endif
-# For libebml/libmatroska. Grrr.
-ifneq ($(AR),)
-HOSTCC2=$(HOSTCC) AR="$(AR) rcvu"
-else
-HOSTCC2=$(HOSTCC)
-endif
-
# Just a shortcut for readability
ENABLED=1
@@ -815,7 +808,7 @@ libebml: libebml-$(LIBEBML_VERSION).tar.bz2
ifdef HAVE_WIN32
(cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) SHARED=no && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC))
else
- (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
+ (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
$(RANLIB) $(PREFIX)/lib/libebml.a
endif
touch $@
More information about the vlc-commits
mailing list