contrib: fix SDL_image dependencies

diff --git a/contrib/src/SDL_image/rules.mak b/contrib/src/SDL_image/rules.mak
index f3c84d2a7459c6869b0a15f3da224e022a3926e2..857befcf91297dfee2e126cf789ee9c1729d12d5 100644 (file)
--- 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 362d9f0d65b8a20cb847a6df2bc03c7de3509dc3..5a75216e795184dbdbef35cac1dd7f075844b261 100644 (file)
--- 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))