[vlc-commits] contrib: fix SDL_image dependencies

Rémi Denis-Courmont git at videolan.org
Tue Jul 5 17:41:13 CEST 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jul  5 18:39:50 2011 +0300| [9fa5178390438c35aba664e289461b049c074c72] | committer: Rémi Denis-Courmont

contrib: fix SDL_image dependencies

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

 contrib/src/SDL_image/rules.mak |    3 +++
 contrib/src/tiff/rules.mak      |    2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/src/SDL_image/rules.mak b/contrib/src/SDL_image/rules.mak
index f3c84d2..857befc 100644
--- a/contrib/src/SDL_image/rules.mak
+++ b/contrib/src/SDL_image/rules.mak
@@ -18,6 +18,9 @@ SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz .sum-SDL_image
 	$(APPLY) $(SRC)/SDL_image/SDL_image.patch
 	$(MOVE)
 
+DEPS_SDL_image = png $(DEPS_png) jpeg $(DEPS_jpeg) tiff $(DEPS_tiff) \
+	sdl $(DEPS_sdl)
+
 .SDL_image: SDL_image .png .jpeg .sdl
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-tif --disable-sdltest
 	cd $< && $(MAKE) install
diff --git a/contrib/src/tiff/rules.mak b/contrib/src/tiff/rules.mak
index 362d9f0..5a75216 100644
--- a/contrib/src/tiff/rules.mak
+++ b/contrib/src/tiff/rules.mak
@@ -3,8 +3,6 @@
 TIFF_VERSION := 3.9.5
 TIFF_URL := ftp://ftp.remotesensing.org/libtiff/tiff-$(TIFF_VERSION).tar.gz
 
-PKGS += tiff
-
 $(TARBALLS)/tiff-$(TIFF_VERSION).tar.gz:
 	$(call download,$(TIFF_URL))
 



More information about the vlc-commits mailing list