contrib: use VPATH to symplify tarball dependencies

contrib/src/a52/rules.mak

@@ -8,11 +8,11 @@ PKGS += a52
 $(TARBALLS)/a52dec-$(A52DEC_VERSION).tar.gz:
 	$(DOWNLOAD) $(A52DEC_URL)
 
-.sum-a52: $(TARBALLS)/a52dec-$(A52DEC_VERSION).tar.gz
+.sum-a52: a52dec-$(A52DEC_VERSION).tar.gz
 	$(CHECK_SHA512)
 	touch $@
 
-a52dec: $(TARBALLS)/a52dec-$(A52DEC_VERSION).tar.gz .sum-a52
+a52dec: a52dec-$(A52DEC_VERSION).tar.gz .sum-a52
 	$(UNPACK_GZ)
 ifndef HAVE_FPU
 	(cd $@-$(A52DEC_VERSION) && patch -p0) < $(SRC)/a52/liba52-fixed.diff

contrib/src/directx/rules.mak

@@ -9,11 +9,11 @@ endif
 $(TARBALLS)/directx-oss.tar.bz2:
 	$(DOWNLOAD) $(DX_HEADERS_URL)
 
-.sum-directx: $(TARBALLS)/directx-oss.tar.bz2
+.sum-directx: directx-oss.tar.bz2
 	$(CHECK_SHA512)
 	touch $@
 
-.directx: $(TARBALLS)/directx-oss.tar.bz2 .sum-directx
+.directx: directx-oss.tar.bz2 .sum-directx
 	mkdir -p -- "$(PREFIX)/include"
 	tar xvjf $< -C "$(PREFIX)/include"
 	touch $@

contrib/src/dshow/rules.mak

@@ -21,11 +21,11 @@ $(TARBALLS)/d2d_headers.tar.gz:
 
 DSHOW_SOURCES := dshow-headers-oss.tar.bz2 dxva2api.h d2d_headers.tar.gz
 
-.sum-dshow: $(DSHOW_SOURCES:%=$(TARBALLS)/%)
+.sum-dshow: $(DSHOW_SOURCES)
 	$(CHECK_SHA512)
 	touch $@
 
-.dshow: $(DSHOW_SOURCES:%=$(TARBALLS)/%) .sum-dshow
+.dshow: $(DSHOW_SOURCES) .sum-dshow
 	mkdir -p -- "$(PREFIX)/include"
 	tar xjf $< -C "$(PREFIX)/include" \
 		--wildcards --no-anchored '*.h' --strip-components=1

contrib/src/ebml/rules.mak

@@ -7,11 +7,11 @@ EBML_URL := http://dl.matroska.org/downloads/libebml/libebml-$(EBML_VERSION).tar
 $(TARBALLS)/libebml-$(EBML_VERSION).tar.bz2:
 	$(DOWNLOAD) $(EBML_URL)
 
-.sum-ebml: $(TARBALLS)/libebml-$(EBML_VERSION).tar.bz2
+.sum-ebml: libebml-$(EBML_VERSION).tar.bz2
 	$(CHECK_SHA512)
 	touch $@
 
-libebml: $(TARBALLS)/libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
+libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
 	$(UNPACK_BZ2)
 	mv $@-$(EBML_VERSION) $@
 	touch $@

contrib/src/flac/rules.mak

@@ -8,11 +8,11 @@ PKGS += flac
 $(TARBALLS)/flac-$(FLAC_VERSION).tar.gz:
 	$(DOWNLOAD) $(FLAC_URL)
 
-.sum-flac: $(TARBALLS)/flac-$(FLAC_VERSION).tar.gz
+.sum-flac: flac-$(FLAC_VERSION).tar.gz
 	$(CHECK_SHA512)
 	touch $@
 
-flac: $(TARBALLS)/flac-$(FLAC_VERSION).tar.gz .sum-flac
+flac: flac-$(FLAC_VERSION).tar.gz .sum-flac
 	$(UNPACK_GZ)
 	(cd $@-$(FLAC_VERSION) && patch -p1) < $(SRC)/flac/flac-win32.patch
 	(cd $@-$(FLAC_VERSION) && patch -p1) < $(SRC)/flac/libFLAC-pc.patch

contrib/src/live555/rules.mak

@@ -7,11 +7,11 @@ PKGS += live555
 $(TARBALLS)/live555-latest.tar.gz:
 	$(DOWNLOAD) $(LIVEDOTCOM_URL)
 
-.sum-live555: $(TARBALLS)/live555-latest.tar.gz
+.sum-live555: live555-latest.tar.gz
 	$(CHECK_SHA512)
 	touch $@
 
-live555: $(TARBALLS)/live555-latest.tar.gz .sum-live555
+live555: live555-latest.tar.gz .sum-live555
 	$(UNPACK_GZ)
 	patch -p0 < $(SRC)/live555/live-uselocale.patch
 	patch -p0 < $(SRC)/live555/live-inet_ntop.patch

contrib/src/lua/rules.mak

@@ -24,11 +24,11 @@ PKGS += lua
 $(TARBALLS)/lua-$(LUA_VERSION).tar.gz:
 	$(DOWNLOAD) $(LUA_URL)
 
-.sum-lua: $(TARBALLS)/lua-$(LUA_VERSION).tar.gz
+.sum-lua: lua-$(LUA_VERSION).tar.gz
 	$(CHECK_SHA512)
 	touch $@
 
-lua: $(TARBALLS)/lua-$(LUA_VERSION).tar.gz .sum-lua
+lua: lua-$(LUA_VERSION).tar.gz .sum-lua
 	$(UNPACK_GZ)
 	(cd $@-$(LUA_VERSION) && patch -p1) < $(SRC)/lua/lua-noreadline.patch
 ifdef HAVE_MACOSX

contrib/src/main.mak

@@ -9,6 +9,7 @@ ALL_PKGS := $(patsubst ../src/%/rules.mak,%,$(wildcard ../src/*/rules.mak))
 SRC := ../src
 TARBALLS := ../tarballs
 DATE := $(shell date +%Y%m%d)
+VPATH := $(TARBALLS)
 
 # Common download locations
 GNU := http://ftp.gnu.org/gnu

contrib/src/matroska/rules.mak

@@ -9,11 +9,11 @@ PKGS += matroska
 $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2:
 	$(DOWNLOAD) $(MATROSKA_URL)
 
-.sum-matroska: $(TARBALLS/libmatroska-$(MATROSKA_VERSION).tar.bz2
+.sum-matroska: libmatroska-$(MATROSKA_VERSION).tar.bz2
 	$(CHECK_SHA512)
 	touch $@
 
-libmatroska: $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
+libmatroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
 	$(UNPACK_BZ2)
 	mv $@-$(MATROSKA_VERSION) $@
 	touch $@

contrib/src/ogg/rules.mak

@@ -2,27 +2,27 @@
 
 OGG_VERSION := 1.2.2
 
-OGG_TARBALL := libogg-$(OGG_VERSION).tar.xz
-OGG_URL := http://downloads.xiph.org/releases/ogg/$(OGG_TARBALL)
-#OGG_URL := $(CONTRIB_VIDEOLAN)/$(OGG_TARBALL)
+OGG_URL := http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.xz
+#OGG_URL := $(CONTRIB_VIDEOLAN)/libogg-$(OGG_VERSION).tar.xz
 OGG_CVSROOT := :pserver:anoncvs@xiph.org:/usr/local/cvsroot
 
 NEED_OGG = $(call need_pkg,"ogg >= 1.0")
 
-$(TARBALLS)/$(OGG_TARBALL):
+$(TARBALLS)/libogg-$(OGG_VERSION).tar.xz:
 	$(DOWNLOAD) $(OGG_URL)
 
-.sum-ogg: $(TARBALLS)/$(OGG_TARBALL)
+.sum-ogg: libogg-$(OGG_VERSION).tar.xz
 	$(CHECK_SHA512)
 	touch $@
 
-libogg: $(TARBALLS)/$(OGG_TARBALL) .sum-ogg
+libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
 	$(UNPACK_XZ)
 	(cd $@-$(OGG_VERSION) && patch -p1) < $(SRC)/ogg/libogg-1.1.patch
 ifdef HAVE_WINCE
 	(cd $@-$(OGG_VERSION) && patch -p1) < $(SRC)/ogg/libogg-wince.patch
 endif
 	mv $@-$(OGG_VERSION) $@
+	touch $@
 
 ifeq ($(NEED_OGG),)
 .ogg:

contrib/src/speex/rules.mak

@@ -8,11 +8,11 @@ PKGS += speex
 $(TARBALLS)/speex-$(SPEEX_VERSION).tar.gz:
 	$(DOWNLOAD) $(SPEEX_URL)
 
-.sum-speex: $(TARBALLS)/speex-$(SPEEX_VERSION).tar.gz
+.sum-speex: speex-$(SPEEX_VERSION).tar.gz
 	$(CHECK_SHA512)
 	touch $@
 
-speex: $(TARBALLS)/speex-$(SPEEX_VERSION).tar.gz .sum-speex
+speex: speex-$(SPEEX_VERSION).tar.gz .sum-speex
 	$(UNPACK_GZ)
 	mv $@-$(SPEEX_VERSION) $@
 	touch $@

contrib/src/theora/rules.mak

@@ -9,11 +9,11 @@ PKGS += theora
 $(TARBALLS)/libtheora-$(THEORA_VERSION).tar.xz:
 	$(DOWNLOAD) $(THEORA_URL)
 
-.sum-theora: $(TARBALLS)/libtheora-$(THEORA_VERSION).tar.xz
+.sum-theora: libtheora-$(THEORA_VERSION).tar.xz
 	$(CHECK_SHA512)
 	touch $@
 
-libtheora: $(TARBALLS)/libtheora-$(THEORA_VERSION).tar.xz .sum-theora
+libtheora: libtheora-$(THEORA_VERSION).tar.xz .sum-theora
 	$(UNPACK_XZ)
 	(cd $@-$(THEORA_VERSION) && patch -p1) < $(SRC)/theora/libtheora-includes.patch
 ifdef HAVE_WIN64

contrib/src/tremor/rules.mak

@@ -9,11 +9,11 @@ $(TARBALLS)/tremor-svn.tar.xz:
 	$(SVN) export http://svn.xiph.org/trunk/Tremor tremor-svn
 	tar cv tremor-svn | xz > $@
 
-.sum-tremor: $(TARBALLS)/tremor-svn.tar.xz
+.sum-tremor: tremor-svn.tar.xz
 	$(warning Integrity check skipped.)
 	touch $@
 
-tremor: $(TARBALLS)/tremor-svn.tar.xz .sum-tremor
+tremor: tremor-svn.tar.xz .sum-tremor
 	# Stuff that does not depend on libogg
 	$(UNPACK_XZ)
 	(cd tremor-svn && patch -p0) < $(SRC)/tremor/tremor.patch

contrib/src/vorbis/rules.mak

@@ -14,11 +14,11 @@ endif
 $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
 	$(DOWNLOAD) $(VORBIS_URL)
 
-.sum-vorbis: $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz
+.sum-vorbis: libvorbis-$(VORBIS_VERSION).tar.xz
 	$(CHECK_SHA512)
 	touch $@
 
-libvorbis: $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
+libvorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
 	$(UNPACK_XZ)
 	mv $@-$(VORBIS_VERSION) $@
 	touch $@