Use a subfolder for the contribs prebuilt...

[vlc] / contrib / src / theora / rules.mak

diff --git a/contrib/src/theora/rules.mak b/contrib/src/theora/rules.mak
index aa68e7bcbbfaa668c5af889c07d51023c51a4ef0..c3b6c1e89922f23bad5fee2bc69b1ca9274392a5 100644 (file)
--- a/contrib/src/theora/rules.mak
+++ b/contrib/src/theora/rules.mak
@@ -5,6 +5,9 @@ THEORA_URL := http://downloads.xiph.org/releases/theora/libtheora-$(THEORA_VERSI
 #THEORA_URL := $(CONTRIB_VIDEOLAN)/libtheora-$(THEORA_VERSION).tar.xz
 
 PKGS += theora
+ifeq ($(call need_pkg,"theora >= 1.0"),)
+PKGS_FOUND += theora
+endif
 
 $(TARBALLS)/libtheora-$(THEORA_VERSION).tar.xz:
        $(call download,$(THEORA_URL))
@@ -14,9 +17,7 @@ $(TARBALLS)/libtheora-$(THEORA_VERSION).tar.xz:
 libtheora: libtheora-$(THEORA_VERSION).tar.xz .sum-theora
        $(UNPACK)
        $(APPLY) $(SRC)/theora/libtheora-includes.patch
-ifdef HAVE_WIN64
-       cd $(UNPACK_DIR) && autoreconf -fi -I m4 $(ACLOCAL_AMFLAGS)
-endif
+       echo 'ACLOCAL_AMFLAGS = -I m4' >> $(UNPACK_DIR)/Makefile.am
        $(MOVE)
 
 THEORACONF := $(HOSTCONF) \
@@ -39,11 +40,12 @@ ifdef HAVE_WIN64
 THEORACONF += --disable-asm
 endif
 
-.theora: libtheora .ogg
+DEPS_theora = ogg $(DEPS_ogg)
+
+.theora: libtheora
 ifdef HAVE_WIN32
-       cd $<; $(HOSTVARS) ./autogen.sh $(THEORACONF)
+       $(RECONF)
 endif
-       test -f $</config.status || \
-       (cd $<  && $(HOSTVARGS) ./configure $(THEORACONF))
+       cd $< && $(HOSTVARS) ./configure $(THEORACONF)
        cd $< && $(MAKE) install
        touch $@