From dee983d4e97d78b4c33f93e7fb1ce313e9d6f5f9 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sun, 11 Aug 2019 23:22:35 +0200
Subject: [PATCH] - add _DEPS variable

---
 make/target-development.mk  |   4 +-
 make/target-libs-static.mk  |   2 +-
 make/target-libs-unused.mk  |  20 ++++--
 make/target-libs.mk         |  64 +++++++++++------
 make/target-lua.mk          |  20 ++++--
 make/target-tools-unused.mk |  26 ++++---
 make/target-tools.mk        | 133 +++++++++++++++++++++++++++---------
 7 files changed, 194 insertions(+), 75 deletions(-)

diff --git a/make/target-development.mk b/make/target-development.mk
index 633ca3d5..73844e11 100644
--- a/make/target-development.mk
+++ b/make/target-development.mk
@@ -102,7 +102,9 @@ GDB_URL    = https://sourceware.org/pub/gdb/releases
 $(ARCHIVE)/$(GDB_SOURCE):
 	$(DOWNLOAD) $(GDB_URL)/$(GDB_SOURCE)
 
-$(D)/gdb: $(D)/zlib $(D)/ncurses $(ARCHIVE)/$(GDB_SOURCE) | $(TARGET_DIR)
+GDB_DEPS   = $(D)/zlib $(D)/ncurses
+
+$(D)/gdb: $(GDB_DEPS) $(ARCHIVE)/$(GDB_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(GDB_TMP)
 	$(UNTAR)/$(GDB_SOURCE)
 	$(CHDIR)/$(GDB_TMP); \
diff --git a/make/target-libs-static.mk b/make/target-libs-static.mk
index 4b9477cb..57cf4c3a 100644
--- a/make/target-libs-static.mk
+++ b/make/target-libs-static.mk
@@ -20,7 +20,7 @@ CORTEX-STRINGS_URL    = http://git.linaro.org/git-ro/toolchain/cortex-strings.gi
 $(ARCHIVE)/$(CORTEX-STRINGS_SOURCE):
 	$(GET-GIT-ARCHIVE) $(CORTEX-STRINGS_URL) $(CORTEX-STRINGS_VER) $(notdir $@) $(ARCHIVE)
 
-CORTEX-STRINGS_CONF =
+CORTEX-STRINGS_CONF   = $(EMPTY)
 ifneq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
   CORTEX-STRINGS_CONF = --without-neon
 endif
diff --git a/make/target-libs-unused.mk b/make/target-libs-unused.mk
index ffa2b083..0075e5b2 100644
--- a/make/target-libs-unused.mk
+++ b/make/target-libs-unused.mk
@@ -13,7 +13,9 @@ $(ARCHIVE)/$(LIBID3TAG_SOURCE):
 
 LIBID3TAG_PATCH  = libid3tag-pc.patch
 
-$(D)/libid3tag: $(D)/zlib $(ARCHIVE)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR)
+LIBID3TAG_DEPS   = $(D)/zlib
+
+$(D)/libid3tag: $(LIBID3TAG_DEPS) $(ARCHIVE)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBID3TAG_TMP)
 	$(UNTAR)/$(LIBID3TAG_SOURCE)
 	$(CHDIR)/$(LIBID3TAG_TMP); \
@@ -126,7 +128,9 @@ FONTCONFIG_URL    = https://www.freedesktop.org/software/fontconfig/release
 $(ARCHIVE)/$(FONTCONFIG_SOURCE):
 	$(DOWNLOAD) $(FONTCONFIG_URL)/$(FONTCONFIG_SOURCE)
 
-$(D)/fontconfig: $(D)/freetype $(D)/expat $(ARCHIVE)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR)
+FONTCONFIG_DEPS   = $(D)/freetype $(D)/expat
+
+$(D)/fontconfig: $(FONTCONFIG_DEPS) $(ARCHIVE)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(FONTCONFIG_TMP)
 	$(UNTAR)/$(FONTCONFIG_SOURCE)
 	$(CHDIR)/$(FONTCONFIG_TMP); \
@@ -159,7 +163,9 @@ PIXMAN_PATCH  = pixman-0001-ARM-qemu-related-workarounds-in-cpu-features-detecti
 PIXMAN_PATCH += pixman-asm_include.patch
 PIXMAN_PATCH += pixman-0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch
 
-$(D)/pixman: $(D)/zlib $(D)/libpng $(ARCHIVE)/$(PIXMAN_SOURCE) | $(TARGET_DIR)
+PIXMAN_DEPS   = $(D)/zlib $(D)/libpng
+
+$(D)/pixman: $(PIXMAN_DEPS) $(ARCHIVE)/$(PIXMAN_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PIXMAN_TMP)
 	$(UNTAR)/$(PIXMAN_SOURCE)
 	$(CHDIR)/$(PIXMAN_TMP); \
@@ -190,7 +196,9 @@ $(ARCHIVE)/$(CAIRO_SOURCE):
 
 CAIRO_PATCH  = cairo-get_bitmap_surface.diff
 
-$(D)/cairo: $(D)/fontconfig $(D)/glib2 $(D)/libpng $(D)/pixman $(D)/zlib $(ARCHIVE)/$(CAIRO_SOURCE) | $(TARGET_DIR)
+CAIRO_DEPS   = $(D)/fontconfig $(D)/glib2 $(D)/libpng $(D)/pixman $(D)/zlib
+
+$(D)/cairo: $(CAIRO_DEPS) $(ARCHIVE)/$(CAIRO_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(CAIRO_TMP)
 	$(UNTAR)/$(CAIRO_SOURCE)
 	$(CHDIR)/$(CAIRO_TMP); \
@@ -243,7 +251,9 @@ $(ARCHIVE)/$(HARFBUZZ_SOURCE):
 
 HARFBUZZ_PATCH  = harfbuzz-disable-docs.patch
 
-$(D)/harfbuzz: $(D)/fontconfig $(D)/glib2 $(D)/cairo $(D)/freetype $(ARCHIVE)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR)
+HARFBUZZ_DEPS   = $(D)/fontconfig $(D)/glib2 $(D)/cairo $(D)/freetype
+
+$(D)/harfbuzz: $(HARFBUZZ_DEPS) $(ARCHIVE)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(HARFBUZZ_TMP)
 	$(UNTAR)/$(HARFBUZZ_SOURCE)
 	$(CHDIR)/$(HARFBUZZ_TMP); \
diff --git a/make/target-libs.mk b/make/target-libs.mk
index 3f67f75e..bac2c67b 100644
--- a/make/target-libs.mk
+++ b/make/target-libs.mk
@@ -160,12 +160,14 @@ LIBCURL_URL    = https://curl.haxx.se/download
 $(ARCHIVE)/$(LIBCURL_SOURCE):
 	$(DOWNLOAD) $(LIBCURL_URL)/$(LIBCURL_SOURCE)
 
+LIBCURL_DEPS   = $(D)/zlib $(D)/openssl $(D)/librtmp $(D)/ca-bundle
+
 LIBCURL_IPV6 = --enable-ipv6
 ifeq ($(BOXSERIES), hd1)
   LIBCURL_IPV6 = --disable-ipv6
 endif
 
-$(D)/libcurl: $(D)/zlib $(D)/openssl $(D)/librtmp $(D)/ca-bundle $(ARCHIVE)/curl-$(LIBCURL_VER).tar.bz2 | $(TARGET_DIR)
+$(D)/libcurl: $(LIBCURL_DEPS) $(ARCHIVE)/$(LIBCURL_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBCURL_TMP)
 	$(UNTAR)/$(LIBCURL_SOURCE)
 	$(CHDIR)/$(LIBCURL_TMP); \
@@ -217,12 +219,14 @@ $(ARCHIVE)/$(LIBPNG_SOURCE):
 
 LIBPNG_PATCH  = libpng-Disable-pngfix-and-png-fix-itxt.patch
 
-LIBPNG_CONF =
+LIBPNG_DEPS   = $(D)/zlib
+
+LIBPNG_CONF   = $(EMPTY)
 ifneq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
   LIBPNG_CONF = --disable-arm-neon
 endif
 
-$(D)/libpng: $(D)/zlib $(ARCHIVE)/$(LIBPNG_SOURCE) | $(TARGET_DIR)
+$(D)/libpng: $(LIBPNG_DEPS) $(ARCHIVE)/$(LIBPNG_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBPNG_TMP)
 	$(UNTAR)/$(LIBPNG_SOURCE)
 	$(CHDIR)/$(LIBPNG_TMP); \
@@ -253,11 +257,13 @@ FREETYPE_URL    = https://sourceforge.net/projects/freetype/files/freetype2/$(FR
 $(ARCHIVE)/$(FREETYPE_SOURCE):
 	$(DOWNLOAD) $(FREETYPE_URL)/$(FREETYPE_SOURCE)
 
+FREETYPE_DEPS   = $(D)/zlib $(D)/libpng
+
 FREETYPE_PATCH  = freetype2-subpixel.patch
 FREETYPE_PATCH += freetype2-config.patch
 FREETYPE_PATCH += freetype2-pkgconf.patch
 
-$(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/$(FREETYPE_SOURCE) | $(TARGET_DIR)
+$(D)/freetype: $(FREETYPE_DEPS) $(ARCHIVE)/$(FREETYPE_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(FREETYPE_TMP)
 	$(UNTAR)/$(FREETYPE_SOURCE)
 	$(CHDIR)/$(FREETYPE_TMP); \
@@ -515,7 +521,9 @@ LIBUSB-COMPAT_URL    = https://sourceforge.net/projects/libusb/files/libusb-comp
 $(ARCHIVE)/$(LIBUSB-COMPAT_SOURCE):
 	$(DOWNLOAD) $(LIBUSB-COMPAT_URL)/$(LIBUSB-COMPAT_SOURCE)
 
-$(D)/libusb-compat: $(D)/libusb $(ARCHIVE)/$(LIBUSB-COMPAT_SOURCE) | $(TARGET_DIR)
+LUBUSB-COMPAT_DEPS   = $(D)/libusb
+
+$(D)/libusb-compat: $(LUBUSB-COMPAT_DEPS) $(ARCHIVE)/$(LIBUSB-COMPAT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBUSB-COMPAT_TMP)
 	$(UNTAR)/$(LIBUSB-COMPAT_SOURCE)
 	$(CHDIR)/$(LIBUSB-COMPAT_TMP); \
@@ -541,7 +549,9 @@ LIBGD_URL    = https://github.com/libgd/libgd/releases/download/gd-$(LIBGD_VER)
 $(ARCHIVE)/$(LIBGD_SOURCE):
 	$(DOWNLOAD) $(LIBGD_URL)/$(LIBGD_SOURCE)
 
-$(D)/libgd2: $(D)/zlib $(D)/libpng $(D)/libjpeg $(D)/freetype $(ARCHIVE)/$(LIBGD_SOURCE) | $(TARGET_DIR)
+LIBGD_DEPS   = $(D)/zlib $(D)/libpng $(D)/libjpeg $(D)/freetype
+
+$(D)/libgd2: $(LIBGD_DEPS) $(ARCHIVE)/$(LIBGD_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBGD_TMP)
 	$(UNTAR)/$(LIBGD_SOURCE)
 	$(CHDIR)/$(LIBGD_TMP); \
@@ -569,7 +579,9 @@ LIBDPF_URL    = https://bitbucket.org/max_10
 
 LIBDPF_PATCH  = libdpf-crossbuild.patch
 
-$(D)/libdpf: $(D)/libusb-compat | $(TARGET_DIR)
+LIBDPF_DEPS   = $(D)/libusb-compat
+
+$(D)/libdpf: $(LIBDPF_DEPS) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBDPF_TMP)
 	$(GET-GIT-SOURCE) $(LIBDPF_URL)/$(LIBDPF_SOURCE) $(ARCHIVE)/$(LIBDPF_SOURCE)
 	$(CPDIR)/$(LIBDPF_SOURCE)
@@ -682,7 +694,7 @@ $(ARCHIVE)/$(LIBBLURAY_SOURCE):
 
 LIBBLURAY_PATCH  = libbluray.patch
 
-LIBBLURAY_DEPS = $(D)/freetype
+LIBBLURAY_DEPS   = $(D)/freetype
 ifeq ($(BOXSERIES), hd2)
   LIBBLURAY_DEPS += $(D)/libaacs $(D)/libbdplus
 endif
@@ -728,7 +740,9 @@ $(ARCHIVE)/$(LIBASS_SOURCE):
 
 LIBASS_PATCH  = libass.patch
 
-$(D)/libass: $(D)/freetype $(D)/fribidi $(ARCHIVE)/$(LIBASS_SOURCE) | $(TARGET_DIR)
+LIBASS_DEPS   = $(D)/freetype $(D)/fribidi
+
+$(D)/libass: $(LIBASS_DEPS) $(ARCHIVE)/$(LIBASS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBASS_TMP)
 	$(UNTAR)/$(LIBASS_SOURCE)
 	$(CHDIR)/$(LIBASS_TMP); \
@@ -793,7 +807,9 @@ LIBGCRYPT_URL    = ftp://ftp.gnupg.org/gcrypt/libgcrypt
 $(ARCHIVE)/$(LIBGCRYPT_SOURCE):
 	$(DOWNLOAD) $(LIBGCRYPT_URL)/$(LIBGCRYPT_SOURCE)
 
-$(D)/libgcrypt: $(D)/libgpg-error $(ARCHIVE)/$(LIBGCRYPT_SOURCE) | $(TARGET_DIR)
+LIBGCRYPT_DEPS   = $(D)/libgpg-error
+
+$(D)/libgcrypt: $(LIBGCRYPT_DEPS) $(ARCHIVE)/$(LIBGCRYPT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBGCRYPT_TMP)
 	$(UNTAR)/$(LIBGCRYPT_SOURCE)
 	$(CHDIR)/$(LIBGCRYPT_TMP); \
@@ -826,7 +842,9 @@ LIBAACS_URL    = ftp://ftp.videolan.org/pub/videolan/libaacs/$(LIBAACS_VER)
 $(ARCHIVE)/$(LIBAACS_SOURCE):
 	$(DOWNLOAD) $(LIBAACS_URL)/$(LIBAACS_SOURCE)
 
-$(D)/libaacs: $(D)/libgcrypt $(ARCHIVE)/$(LIBAACS_SOURCE) | $(TARGET_DIR)
+LIBAACS_DEPS   = $(D)/libgcrypt
+
+$(D)/libaacs: $(LIBAACS_DEPS) $(ARCHIVE)/$(LIBAACS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBAACS_TMP)
 	$(UNTAR)/$(LIBAACS_SOURCE)
 	$(CHDIR)/$(LIBAACS_TMP); \
@@ -858,7 +876,9 @@ LIBBDPLUS_URL    = ftp://ftp.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VER
 $(ARCHIVE)/$(LIBBDPLUS_SOURCE):
 	$(DOWNLOAD) $(LIBBDPLUS_URL)/$(LIBBDPLUS_SOURCE)
 
-$(D)/libbdplus: $(D)/libaacs $(ARCHIVE)/$(LIBBDPLUS_SOURCE) | $(TARGET_DIR)
+LIBBDPLUS_DEPS   = $(D)/libaacs
+
+$(D)/libbdplus: $(LIBBDPLUS_DEPS) $(ARCHIVE)/$(LIBBDPLUS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBBDPLUS_TMP)
 	$(UNTAR)/$(LIBBDPLUS_SOURCE)
 	$(CHDIR)/$(LIBBDPLUS_TMP); \
@@ -946,7 +966,9 @@ $(D)/pugixml: $(ARCHIVE)/$(PUGIXML_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-$(D)/librtmp: $(D)/zlib $(D)/openssl $(SOURCE_DIR)/$(NI-RTMPDUMP) | $(TARGET_DIR)
+RTMPDUMP_DEPS   = $(D)/zlib $(D)/openssl
+
+$(D)/librtmp: $(RTMPDUMP_DEPS) $(SOURCE_DIR)/$(NI-RTMPDUMP) | $(TARGET_DIR)
 	$(REMOVE)/$(NI-RTMPDUMP)
 	tar -C $(SOURCE_DIR) -cp $(NI-RTMPDUMP) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	$(CHDIR)/$(NI-RTMPDUMP); \
@@ -1099,7 +1121,9 @@ LIBVORBISIDEC_URL    = https://ftp.de.debian.org/debian/pool/main/libv/libvorbis
 $(ARCHIVE)/$(LIBVORBISIDEC_SOURCE):
 	$(DOWNLOAD) $(LIBVORBISIDEC_URL)/$(LIBVORBISIDEC_SOURCE)
 
-$(D)/libvorbisidec: $(D)/libogg $(ARCHIVE)/$(LIBVORBISIDEC_SOURCE) | $(TARGET_DIR)
+LIBVORBISIDEC_DEPS   = $(D)/libogg
+
+$(D)/libvorbisidec: $(LIBVORBISIDEC_DEPS) $(ARCHIVE)/$(LIBVORBISIDEC_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBVORBISIDEC_TMP)
 	$(UNTAR)/$(LIBVORBISIDEC_SOURCE)
 	$(CHDIR)/$(LIBVORBISIDEC_TMP); \
@@ -1182,9 +1206,9 @@ $(ARCHIVE)/$(LIBFFI_SOURCE):
 
 LIBFFI_PATCH  = libffi-install_headers.patch
 
-LIBFFI_CONF =
+LIBFFI_CONF   = $(EMPTY)
 ifeq ($(BOXSERIES), hd1)
-	LIBFFI_CONF = --enable-static --disable-shared
+  LIBFFI_CONF = --enable-static --disable-shared
 endif
 
 $(D)/libffi: $(ARCHIVE)/$(LIBFFI_SOURCE) | $(TARGET_DIR)
@@ -1217,17 +1241,17 @@ $(ARCHIVE)/$(GLIB2_SOURCE):
 GLIB2_PATCH  = glib2-disable-tests.patch
 GLIB2_PATCH += glib2-automake.patch
 
-GLIB2_DEPS =
+GLIB2_DEPS   = $(D)/zlib $(D)/libffi
 ifeq ($(BOXSERIES), hd2)
-  GLIB2_DEPS = $(D)/gettext
+  GLIB2_DEPS += $(D)/gettext
 endif
 
-GLIB2_CONF =
+GLIB2_CONF   = $(EMPTY)
 ifeq ($(BOXSERIES), hd1)
   GLIB2_CONF = --enable-static --disable-shared
 endif
 
-$(D)/glib2: $(D)/zlib $(D)/libffi $(GLIB2_DEPS) $(ARCHIVE)/$(GLIB2_SOURCE) | $(TARGET_DIR)
+$(D)/glib2: $(GLIB2_DEPS) $(ARCHIVE)/$(GLIB2_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(GLIB2_TMP)
 	$(UNTAR)/$(GLIB2_SOURCE)
 	$(CHDIR)/$(GLIB2_TMP); \
diff --git a/make/target-lua.mk b/make/target-lua.mk
index 3eda6379..44367e9b 100644
--- a/make/target-lua.mk
+++ b/make/target-lua.mk
@@ -18,7 +18,9 @@ LUA_PATCH += lua-02-shared-libs-for-lua.patch
 LUA_PATCH += lua-03-lua-pc.patch
 LUA_PATCH += lua-04-crashfix.diff
 
-$(D)/lua: $(D)/ncurses $(ARCHIVE)/$(LUA_SOURCE) | $(TARGET_DIR)
+LUA_DEPS   = $(D)/ncurses
+
+$(D)/lua: $(LUA_DEPS) $(ARCHIVE)/$(LUA_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LUA_TMP)
 	$(UNTAR)/$(LUA_SOURCE)
 	$(CHDIR)/$(LUA_TMP); \
@@ -48,7 +50,9 @@ $(ARCHIVE)/$(LUAEXPAT_SOURCE):
 
 LUAEXPAT_PATCH  = luaexpat-makefile.patch
 
-$(D)/luaexpat: $(D)/expat $(D)/lua $(ARCHIVE)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR)
+LUAEXPAT_DEPS   = $(D)/expat $(D)/lua
+
+$(D)/luaexpat: $(LUAEXPAT_DEPS) $(ARCHIVE)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LUAEXPAT_TMP)
 	$(UNTAR)/$(LUAEXPAT_SOURCE)
 	$(CHDIR)/$(LUAEXPAT_TMP); \
@@ -72,7 +76,9 @@ $(ARCHIVE)/$(LUA-FEEDPARSER_SOURCE):
 
 LUA-FEEDPARSER_PATCH  = lua-feedparser.patch
 
-$(D)/lua-feedparser: $(D)/luaexpat $(ARCHIVE)/$(LUA-FEEDPARSER_SOURCE) | $(TARGET_DIR)
+LUA-DEEDPARSER_DEPS   = $(D)/luaexpat
+
+$(D)/lua-feedparser: $(LUA-DEEDPARSER_DEPS) $(ARCHIVE)/$(LUA-FEEDPARSER_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LUA-FEEDPARSER_TMP)
 	$(UNTAR)/$(LUA-FEEDPARSER_SOURCE)
 	$(CHDIR)/$(LUA-FEEDPARSER_TMP); \
@@ -104,7 +110,9 @@ LUACURL_TMP    = lua-curlv3.$(LUACURL_VER)
 LUACURL_SOURCE = lua-curlv3.$(LUACURL_VER)
 LUACURL_URL    = https://github.com/lua-curl/$(LUACURL_SOURCE)
 
-$(D)/luacurl: $(D)/libcurl $(D)/lua | $(TARGET_DIR)
+LUACURL_DEPS   = $(D)/libcurl $(D)/lua
+
+$(D)/luacurl: $(LUACURL_DEPS) | $(TARGET_DIR)
 	$(REMOVE)/$(LUACURL_TMP)
 	$(GET-GIT-SOURCE) $(LUACURL_URL) $(ARCHIVE)/$(LUACURL_SOURCE)
 	$(CPDIR)/$(LUACURL_SOURCE)
@@ -132,6 +140,8 @@ $(ARCHIVE)/$(LUAPOSIX_SOURCE):
 LUAPOSIX_PATCH  = luaposix-fix-build.patch
 LUAPOSIX_PATCH += luaposix-fix-docdir-build.patch
 
+LUAPOSIX_DEPS   = $(HOST_LUA) $(D)/lua $(D)/luaexpat
+
 GNULIB_VER    = 20140202
 GNULIB_SOURCE = gnulib-$(GNULIB_VER)-stable.tar.gz
 GNULIB_URL    = http://erislabs.net/ianb/projects/gnulib
@@ -146,7 +156,7 @@ SLINGSHOT_URL    = https://github.com/gvvaughan/slingshot/archive
 $(ARCHIVE)/$(SLINGSHOT_SOURCE):
 	$(DOWNLOAD) $(SLINGSHOT_URL)/v$(SLINGSHOT_VER).tar.gz -O $@
 
-$(D)/luaposix: $(HOST_LUA) $(D)/lua $(D)/luaexpat $(ARCHIVE)/$(SLINGSHOT_SOURCE) $(ARCHIVE)/$(GNULIB_SOURCE) $(ARCHIVE)/$(LUAPOSIX_SOURCE) | $(TARGET_DIR)
+$(D)/luaposix: $(LUAPOSIX_DEPS) $(ARCHIVE)/$(SLINGSHOT_SOURCE) $(ARCHIVE)/$(GNULIB_SOURCE) $(ARCHIVE)/$(LUAPOSIX_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LUAPOSIX_TMP)
 	$(UNTAR)/$(LUAPOSIX_SOURCE)
 	$(CHDIR)/$(LUAPOSIX_TMP); \
diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk
index 1d068abc..78737940 100644
--- a/make/target-tools-unused.mk
+++ b/make/target-tools-unused.mk
@@ -15,7 +15,9 @@ $(ARCHIVE)/$(USBUTILS_SOURCE):
 USBUTILS_PATCH  = usbutils-avoid-dependency-on-bash.patch
 USBUTILS_PATCH += usbutils-fix-null-pointer-crash.patch
 
-$(D)/usbutils: $(D)/libusb-compat $(ARCHIVE)/$(USBUTILS_SOURCE) | $(TARGET_DIR)
+USBUTILS_DEPS   = $(D)/libusb-compat
+
+$(D)/usbutils: $(USBUTILS_DEPS) $(ARCHIVE)/$(USBUTILS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(USBUTILS_TMP)
 	$(UNTAR)/$(USBUTILS_SOURCE)
 	$(CHDIR)/$(USBUTILS_TMP); \
@@ -68,16 +70,18 @@ $(D)/binutils: $(ARCHIVE)/$(BINUTILS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-UTIL_LINUX_ABIVER = 2.34
-UTIL_LINUX_VER    = 2.34
-UTIL_LINUX_TMP    = util-linux-$(UTIL_LINUX_VER)
-UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VER).tar.xz
-UTIL_LINUX_URL    = https://www.kernel.org/pub/linux/utils/util-linux/v$(UTIL_LINUX_ABIVER)
+UTIL-LINUX_ABIVER = 2.34
+UTIL-LINUX_VER    = 2.34
+UTIL-LINUX_TMP    = util-linux-$(UTIL-LINUX_VER)
+UTIL-LINUX_SOURCE = util-linux-$(UTIL-LINUX_VER).tar.xz
+UTIL-LINUX_URL    = https://www.kernel.org/pub/linux/utils/util-linux/v$(UTIL-LINUX_ABIVER)
+
+$(ARCHIVE)/$(UTIL-LINUX_SOURCE):
+	$(DOWNLOAD) $(UTIL-LINUX_URL)/$(UTIL-LINUX_SOURCE)
 
-$(ARCHIVE)/$(UTIL_LINUX_SOURCE):
-	$(DOWNLOAD) $(UTIL_LINUX_URL)/$(UTIL_LINUX_SOURCE)
+UTUL-LINUX_DEPS   = $(D)/ncurses $(D)/zlib
 
-$(D)/util-linux: $(D)/ncurses $(D)/zlib $(ARCHIVE)/$(UTIL_LINUX_SOURCE) | $(TARGET_DIR)
+$(D)/util-linux: $(UTUL-LINUX_DEPS) $(ARCHIVE)/$(UTIL-LINUX_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(UTIL-LINUX_TMP)
 	$(UNTAR)/$(UTIL-LINUX_SOURCE)
 	$(CHDIR)/$(UTIL-LINUX_TMP); \
@@ -125,9 +129,11 @@ ASTRA-SM_TMP    = astra-sm.$(ASTRA-SM_VER)
 ASTRA-SM_SOURCE = astra-sm.$(ASTRA-SM_VER)
 ASTRA-SM_URL    = https://gitlab.com/crazycat69
 
+ASTRA-SM_DEPS   = $(D)/openssl
+
 # workaround unrecognized command line options
 $(D)/astra-sm: TARGET_ABI=""
-$(D)/astra-sm: $(D)/openssl | $(TARGET_DIR)
+$(D)/astra-sm: $(ASTRA-SM_DEPS) | $(TARGET_DIR)
 	$(REMOVE)/$(ASTRA-SM_TMP)
 	$(GET-GIT-SOURCE) $(ASTRA-SM_URL)/$(ASTRA-SM_SOURCE) $(ARCHIVE)/$(ASTRA-SM_SOURCE)
 	$(CPDIR)/$(ASTRA-SM_SOURCE)
diff --git a/make/target-tools.mk b/make/target-tools.mk
index acbaa53b..07499f3b 100644
--- a/make/target-tools.mk
+++ b/make/target-tools.mk
@@ -17,6 +17,8 @@ BUSYBOX_PATCH += busybox-mount-use-var-etc-fstab.patch
 BUSYBOX_PATCH += busybox-fix-partition-size.patch
 BUSYBOX_PATCH += busybox-mount_single_uuid.patch
 
+BUSYBOX_DEPS   = $(D)/libtirpc
+
 # Link busybox against libtirpc so that we can leverage its RPC support for NFS
 # mounting with BusyBox
 BUSYBOX_CFLAGS = $(TARGET_CFLAGS)
@@ -82,7 +84,7 @@ define BUSYBOX_MODIFY_CONFIG
 	$(BUSYBOX_SET_PKILL)
 endef
 
-$(D)/busybox: $(D)/libtirpc $(ARCHIVE)/$(BUSYBOX_SOURCE) | $(TARGET_DIR)
+$(D)/busybox: $(BUSYBOX_DEPS) $(ARCHIVE)/$(BUSYBOX_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(BUSYBOX_TMP)
 	$(UNTAR)/$(BUSYBOX_SOURCE)
 	$(CHDIR)/$(BUSYBOX_TMP); \
@@ -105,7 +107,9 @@ OPENVPN_URL    = http://build.openvpn.net/downloads/releases
 $(ARCHIVE)/$(OPENVPN_SOURCE):
 	$(DOWNLOAD) $(OPENVPN_URL)/$(OPENVPN_SOURCE)
 
-$(D)/openvpn: $(D)/lzo $(D)/openssl $(ARCHIVE)/$(OPENVPN_SOURCE) | $(TARGET_DIR)
+OPENVPN_DEPS   = $(D)/lzo $(D)/openssl
+
+$(D)/openvpn: $(OPENVPN_DEPS) $(ARCHIVE)/$(OPENVPN_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(OPENVPN_TMP)
 	$(UNTAR)/$(OPENVPN_SOURCE)
 	$(CHDIR)/$(OPENVPN_TMP); \
@@ -142,7 +146,9 @@ OPENSSH_URL    = https://artfiles.org/openbsd/OpenSSH/portable
 $(ARCHIVE)/$(OPENSSH_SOURCE):
 	$(DOWNLOAD) $(OPENSSH_URL)/$(OPENSSH_SOURCE)
 
-$(D)/openssh: $(D)/openssl $(D)/zlib $(ARCHIVE)/$(OPENSSH_SOURCE) | $(TARGET_DIR)
+OPENSSH_DEPS   = $(D)/openssl $(D)/zlib
+
+$(D)/openssh: $(OPENSSH_DEPS) $(ARCHIVE)/$(OPENSSH_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(OPENSSH_TMP)
 	$(UNTAR)/$(OPENSSH_SOURCE)
 	$(CHDIR)/$(OPENSSH_TMP); \
@@ -182,6 +188,8 @@ TZDATA_URL    = ftp://ftp.iana.org/tz/releases
 $(ARCHIVE)/$(TZDATA_SOURCE):
 	$(DOWNLOAD) $(TZDATA_URL)/$(TZDATA_SOURCE)
 
+TZDATA_DEPS   = $(HOST_ZIC)
+
 TZDATA_ZONELIST = \
 	africa antarctica asia australasia europe northamerica \
 	southamerica pacificnew etcetera backward
@@ -192,7 +200,7 @@ else
   LOCALTIME = etc/localtime
 endif
 
-$(D)/tzdata: $(HOST_ZIC) $(ARCHIVE)/$(TZDATA_SOURCE) | $(TARGET_DIR)
+$(D)/tzdata: $(TZDATA_DEPS) $(ARCHIVE)/$(TZDATA_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(TZDATA_TMP)
 	$(MKDIR)/$(TZDATA_TMP)
 	$(CHDIR)/$(TZDATA_TMP); \
@@ -225,7 +233,9 @@ MTD-UTILS_URL    = ftp://ftp.infradead.org/pub/mtd-utils
 $(ARCHIVE)/$(MTD-UTILS_SOURCE):
 	$(DOWNLOAD) $(MTD-UTILS_URL)/$(MTD-UTILS_SOURCE)
 
-$(D)/mtd-utils: $(D)/zlib $(D)/lzo $(D)/e2fsprogs $(ARCHIVE)/$(MTD-UTILS_SOURCE) | $(TARGET_DIR)
+MTD-UTILS_DEPS   = $(D)/zlib $(D)/lzo $(D)/e2fsprogs
+
+$(D)/mtd-utils: $(MTD-UTILS_DEPS) $(ARCHIVE)/$(MTD-UTILS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(MTD-UTILS_TMP)
 	$(UNTAR)/$(MTD-UTILS_SOURCE)
 	$(CHDIR)/$(MTD-UTILS_TMP); \
@@ -289,7 +299,9 @@ $(ARCHIVE)/$(PARTED_SOURCE):
 PARTED_PATCH  = parted-devmapper-1.patch
 PARTED_PATCH += parted-sysmacros.patch
 
-$(D)/parted: $(D)/e2fsprogs $(ARCHIVE)/$(PARTED_SOURCE) | $(TARGET_DIR)
+PARTED_DEPS   = $(D)/e2fsprogs
+
+$(D)/parted: $(PARTED_DEPS) $(ARCHIVE)/$(PARTED_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PARTED_TMP)
 	$(UNTAR)/$(PARTED_SOURCE)
 	$(CHDIR)/$(PARTED_TMP); \
@@ -409,7 +421,9 @@ LESS_URL    = http://www.greenwoodsoftware.com/less
 $(ARCHIVE)/$(LESS_SOURCE):
 	$(DOWNLOAD) $(LESS_URL)/$(LESS_SOURCE)
 
-$(D)/less: $(D)/ncurses $(ARCHIVE)/$(LESS_SOURCE) | $(TARGET_DIR)
+LESS_DEPS   = $(D)/ncurses
+
+$(D)/less: $(LESS_DEPS) $(ARCHIVE)/$(LESS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LESS_TMP)
 	$(UNTAR)/$(LESS_SOURCE)
 	$(CHDIR)/$(LESS_TMP); \
@@ -435,7 +449,9 @@ $(ARCHIVE)/$(NTP_SOURCE):
 
 NTP_PATCH  = ntp.patch
 
-$(D)/ntp: $(D)/openssl $(ARCHIVE)/$(NTP_SOURCE) | $(TARGET_DIR)
+NTP_DEPS   = $(D)/openssl
+
+$(D)/ntp: $(NTP_DEPS) $(ARCHIVE)/$(NTP_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(NTP_TMP)
 	$(UNTAR)/$(NTP_SOURCE)
 	$(CHDIR)/$(NTP_TMP); \
@@ -473,7 +489,9 @@ DJMOUNT_PATCH += djmount-fixed-crash.patch
 DJMOUNT_PATCH += djmount-support-fstab-mounting.diff
 DJMOUNT_PATCH += djmount-support-seeking-in-large-2gb-files.patch
 
-$(D)/djmount: $(D)/libfuse $(ARCHIVE)/$(DJMOUNT_SOURCE) | $(TARGET_DIR)
+DJMOUNT_DEPS   = $(D)/libfuse
+
+$(D)/djmount: $(DJMOUNT_DEPS) $(ARCHIVE)/$(DJMOUNT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(DJMOUNT_TMP)
 	$(UNTAR)/$(DJMOUNT_SOURCE)
 	$(CHDIR)/$(DJMOUNT_TMP); \
@@ -505,7 +523,9 @@ $(ARCHIVE)/$(USHARE_SOURCE):
 USHARE_PATCH  = ushare.diff
 USHARE_PATCH += ushare-fix-building-with-gcc-5.x.patch
 
-$(D)/ushare: $(D)/libupnp $(ARCHIVE)/$(USHARE_SOURCE)| $(TARGET_DIR)
+USHARE_DEPS   = $(D)/libupnp
+
+$(D)/ushare: $(USHARE_DEPS) $(ARCHIVE)/$(USHARE_SOURCE)| $(TARGET_DIR)
 	$(REMOVE)/$(USHARE_TMP)
 	$(UNTAR)/$(USHARE_SOURCE)
 	$(CHDIR)/$(USHARE_TMP); \
@@ -564,7 +584,9 @@ INADYN_URL    = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_
 $(ARCHIVE)/$(INADYN_SOURCE):
 	$(DOWNLOAD) $(INADYN_URL)/$(INADYN_SOURCE)
 
-$(D)/inadyn: $(D)/openssl $(D)/confuse $(D)/libite $(ARCHIVE)/$(INADYN_SOURCE) | $(TARGET_DIR)
+INADYN_DEPS   = $(D)/openssl $(D)/confuse $(D)/libite
+
+$(D)/inadyn: $(INADYN_DEPS) $(ARCHIVE)/$(INADYN_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(INADYN_TMP)
 	$(UNTAR)/$(INADYN_SOURCE)
 	$(CHDIR)/$(INADYN_TMP); \
@@ -602,7 +624,9 @@ VSFTPD_PATCH += vsftpd-disable-capabilities.patch
 VSFTPD_PATCH += vsftpd-fixchroot.patch
 VSFTPD_PATCH += vsftpd-login-blank-password.patch
 
-$(D)/vsftpd: $(D)/openssl $(ARCHIVE)/$(VSFTPD_SOURCE) | $(TARGET_DIR)
+VSFTPD_DEPS   = $(D)/openssl
+
+$(D)/vsftpd: $(VSFTPD_DEPS) $(ARCHIVE)/$(VSFTPD_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(VSFTPD_TMP)
 	$(UNTAR)/$(VSFTPD_SOURCE)
 	$(CHDIR)/$(VSFTPD_TMP); \
@@ -636,7 +660,9 @@ PROCPS-NG_PATCH += procps-ng-no-tests-docs.patch
 
 PROCPS-NG_BIN    = ps top
 
-$(D)/procps-ng: $(D)/ncurses $(ARCHIVE)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR)
+PROCPS-NG_DEPS   = $(D)/ncurses
+
+$(D)/procps-ng: $(PROCPS-NG_DEPS) $(ARCHIVE)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PROCPS-NG_TMP)
 	$(UNTAR)/$(PROCPS-NG_SOURCE)
 	$(CHDIR)/$(PROCPS-NG_TMP); \
@@ -674,7 +700,9 @@ NANO_URL    = https://www.nano-editor.org/dist/v$(basename $(NANO_VER))
 $(ARCHIVE)/$(NANO_SOURCE):
 	$(DOWNLOAD) $(NANO_URL)/$(NANO_SOURCE)
 
-$(D)/nano: $(D)/ncurses $(ARCHIVE)/$(NANO_SOURCE) | $(TARGET_DIR)
+NANO_DEPS   = $(D)/ncurses
+
+$(D)/nano: $(NANO_DEPS) $(ARCHIVE)/$(NANO_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(NANO_TMP)
 	$(UNTAR)/$(NANO_SOURCE)
 	$(CHDIR)/$(NANO_TMP); \
@@ -703,7 +731,9 @@ $(ARCHIVE)/$(MINICOM_SOURCE):
 
 MINICOM_PATCH  = minicom-fix-h-v-return-value-is-not-0.patch
 
-$(D)/minicom: $(D)/ncurses $(ARCHIVE)/$(MINICOM_SOURCE) | $(TARGET_DIR)
+MINICOM_DEPS   = $(D)/ncurses
+
+$(D)/minicom: $(MINICOM_DEPS) $(ARCHIVE)/$(MINICOM_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(MINICOM_TMP)
 	$(UNTAR)/$(MINICOM_SOURCE)
 	$(CHDIR)/$(MINICOM_TMP); \
@@ -850,7 +880,9 @@ $(ARCHIVE)/$(AUTOFS_SOURCE):
 
 AUTOFS_PATCH  = $(addprefix autofs/, $(shell cat $(PATCHES)/autofs/patch_order_$(AUTOFS_VER)))
 
-$(D)/autofs: $(D)/libtirpc $(ARCHIVE)/$(AUTOFS_SOURCE) | $(TARGET_DIR)
+AUTOFS_DEPS   = $(D)/libtirpc
+
+$(D)/autofs: $(AUTOFS_DEPS) $(ARCHIVE)/$(AUTOFS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(AUTOFS_TMP)
 	$(UNTAR)/$(AUTOFS_SOURCE)
 	$(CHDIR)/$(AUTOFS_TMP); \
@@ -907,7 +939,9 @@ $(ARCHIVE)/$(SAMBA33_SOURCE):
 SAMBA33_PATCH  = samba33-build-only-what-we-need.patch
 SAMBA33_PATCH += samba33-configure.in-make-getgrouplist_ok-test-cross-compile.patch
 
-$(D)/samba33: $(D)/zlib $(ARCHIVE)/$(SAMBA33_SOURCE) | $(TARGET_DIR)
+SAMBA33_DEPS   = $(D)/zlib
+
+$(D)/samba33: $(SAMBA33_DEPS) $(ARCHIVE)/$(SAMBA33_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(SAMBA33_TMP)
 	$(UNTAR)/$(SAMBA33_SOURCE)
 	$(CHDIR)/$(SAMBA33_TMP); \
@@ -988,7 +1022,9 @@ SAMBA36_PATCH0  = samba36-CVE-2016-2112-v3-6.patch
 SAMBA36_PATCH0 += samba36-CVE-2016-2115-v3-6.patch
 SAMBA36_PATCH0 += samba36-CVE-2017-7494-v3-6.patch
 
-$(D)/samba36: $(D)/zlib $(ARCHIVE)/$(SAMBA36_SOURCE) | $(TARGET_DIR)
+SAMBA36_DEPS   = $(D)/zlib
+
+$(D)/samba36: $(SAMBA36_DEPS) $(ARCHIVE)/$(SAMBA36_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(SAMBA36_TMP)
 	$(UNTAR)/$(SAMBA36_SOURCE)
 	$(CHDIR)/$(SAMBA36_TMP); \
@@ -1056,7 +1092,9 @@ DROPBEAR_URL    = http://matt.ucc.asn.au/dropbear/releases
 $(ARCHIVE)/$(DROPBEAR_SOURCE):
 	$(DOWNLOAD) $(DROPBEAR_URL)/$(DROPBEAR_SOURCE)
 
-$(D)/dropbear: $(D)/zlib $(ARCHIVE)/$(DROPBEAR_SOURCE) | $(TARGET_DIR)
+DROPBEAR_DEPS   = $(D)/zlib
+
+$(D)/dropbear: $(DROPBEAR_DEPS) $(ARCHIVE)/$(DROPBEAR_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(DROPBEAR_TMP)
 	$(UNTAR)/$(DROPBEAR_SOURCE)
 	$(CHDIR)/$(DROPBEAR_TMP); \
@@ -1138,7 +1176,9 @@ $(ARCHIVE)/$(FBSHOT_SOURCE):
 FBSHOT_PATCH  = fbshot-32bit_cs_fb.diff
 FBSHOT_PATCH += fbshot_cs_hd2.diff
 
-$(D)/fbshot: $(D)/libpng $(ARCHIVE)/$(FBSHOT_SOURCE) | $(TARGET_DIR)
+FBSHOT_DEPS   = $(D)/libpng
+
+$(D)/fbshot: $(FBSHOT_DEPS) $(ARCHIVE)/$(FBSHOT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(FBSHOT_TMP)
 	$(UNTAR)/$(FBSHOT_SOURCE)
 	$(CHDIR)/$(FBSHOT_TMP); \
@@ -1157,7 +1197,9 @@ LCD4LINUX_TMP    = lcd4linux.$(LCD4LINUX_VER)
 LCD4LINUX_SOURCE = lcd4linux.$(LCD4LINUX_VER)
 LCD4LINUX_URL    = https://github.com/TangoCash
 
-$(D)/lcd4linux: $(D)/ncurses $(D)/libgd2 $(D)/libdpf | $(TARGET_DIR)
+LCD4LINUX_DEPS   = $(D)/ncurses $(D)/libgd2 $(D)/libdpf
+
+$(D)/lcd4linux: $(LCD4LINUX_DEPS) | $(TARGET_DIR)
 	$(REMOVE)/$(LCD4LINUX_TMP)
 	$(GET-GIT-SOURCE) $(LCD4LINUX_URL)/$(LCD4LINUX_SOURCE) $(ARCHIVE)/$(LCD4LINUX_SOURCE)
 	$(CPDIR)/$(LCD4LINUX_SOURCE)
@@ -1210,7 +1252,9 @@ WPA_SUPPLICANT_URL    = https://w1.fi/releases
 $(ARCHIVE)/$(WPA_SUPPLICANT_SOURCE):
 	$(DOWNLOAD) $(WPA_SUPPLICANT_URL)/$(WPA_SUPPLICANT_SOURCE)
 
-$(D)/wpa_supplicant: $(D)/openssl $(ARCHIVE)/$(WPA_SUPPLICANT_SOURCE) | $(TARGET_DIR)
+WPA_SUPPLICANT_DEPS   = $(D)/openssl
+
+$(D)/wpa_supplicant: $(WPA_SUPPLICANT_DEPS) $(ARCHIVE)/$(WPA_SUPPLICANT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(WPA_SUPPLICANT_TMP)
 	$(UNTAR)/$(WPA_SUPPLICANT_SOURCE)
 	$(CHDIR)/$(WPA_SUPPLICANT_TMP)/wpa_supplicant; \
@@ -1236,7 +1280,9 @@ XUPNPD_PATCH += xupnpd-fix-webif-backlinks.diff
 XUPNPD_PATCH += xupnpd-change-XUPNPDROOTDIR.diff
 XUPNPD_PATCH += xupnpd-add-configuration-files.diff
 
-$(D)/xupnpd: $(D)/lua $(D)/openssl | $(TARGET_DIR)
+XUPNPD_DEPS   = $(D)/lua $(D)/openssl
+
+$(D)/xupnpd: $(XUPNPD_DEPS) | $(TARGET_DIR)
 	$(REMOVE)/$(XUPNPD_TMP)
 	$(GET-GIT-SOURCE) $(XUPNPD_URL)/$(XUPNPD_SOURCE) $(ARCHIVE)/$(XUPNPD_SOURCE)
 	$(CPDIR)/$(XUPNPD_SOURCE)
@@ -1306,12 +1352,14 @@ NFS-UTILS_PATCH += nfs-utils_03-Let-the-configure-script-find-getrpcbynumber-in-
 NFS-UTILS_PATCH += nfs-utils_04-mountd-Add-check-for-struct-file_handle.patch
 NFS-UTILS_PATCH += nfs-utils_05-sm-notify-use-sbin-instead-of-usr-sbin.patch
 
+NFS-UTILS_DEPS   = $(D)/rpcbind
+
 NFS-UTILS_IPV6   = --enable-ipv6
 ifeq ($(BOXSERIES), hd1)
   NFS-UTILS_IPV6 = --disable-ipv6
 endif
 
-$(D)/nfs-utils: $(D)/rpcbind $(ARCHIVE)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR)
+$(D)/nfs-utils: $(NFS-UTILS_DEPS) $(ARCHIVE)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(NFS-UTILS_TMP)
 	$(UNTAR)/$(NFS-UTILS_SOURCE)
 	$(CHDIR)/$(NFS-UTILS_TMP); \
@@ -1364,7 +1412,9 @@ $(ARCHIVE)/$(RPCBIND_SOURCE):
 RPCBIND_PATCH  = rpcbind-0001-Remove-yellow-pages-support.patch
 RPCBIND_PATCH += rpcbind-0002-add_option_to_fix_port_number.patch
 
-$(D)/rpcbind: $(D)/libtirpc $(ARCHIVE)/$(RPCBIND_SOURCE) | $(TARGET_DIR)
+RPCBIND_DEPS   = $(D)/libtirpc
+
+$(D)/rpcbind: $(RPCBIND_DEPS) $(ARCHIVE)/$(RPCBIND_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(RPCBIND_TMP)
 	$(UNTAR)/$(RPCBIND_SOURCE)
 	$(CHDIR)/$(RPCBIND_TMP); \
@@ -1397,7 +1447,10 @@ FUSE-EXFAT_URL    = https://github.com/relan/exfat/releases/download/v$(FUSE-EXF
 $(ARCHIVE)/$(FUSE-EXFAT_SOURCE):
 	$(DOWNLOAD) $(FUSE-EXFAT_URL)/$(FUSE-EXFAT_SOURCE)
 
-$(D)/fuse-exfat: $(D)/libfuse $(ARCHIVE)/$(FUSE-EXFAT_SOURCE) | $(TARGET_DIR)
+
+FUSE-EXFAT_DEPS   = $(D)/libfuse
+
+$(D)/fuse-exfat: $(FUSE-EXFAT_DEPS) $(ARCHIVE)/$(FUSE-EXFAT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(FUSE-EXFAT_TMP)
 	$(UNTAR)/$(FUSE-EXFAT_SOURCE)
 	$(CHDIR)/$(FUSE-EXFAT_TMP); \
@@ -1422,7 +1475,9 @@ EXFAT-UTILS_URL    = https://github.com/relan/exfat/releases/download/v$(EXFAT-U
 $(ARCHIVE)/$(EXFAT-UTILS_SOURCE):
 	$(DOWNLOAD) $(EXFAT-UTILS_URL)/$(EXFAT-UTILS_SOURCE)
 
-$(D)/exfat-utils: $(D)/fuse-exfat $(ARCHIVE)/$(EXFAT-UTILS_SOURCE) | $(TARGET_DIR)
+EXFAT-UTILS_DEPS   = $(D)/fuse-exfat
+
+$(D)/exfat-utils: $(EXFAT-UTILS_DEPS) $(ARCHIVE)/$(EXFAT-UTILS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(EXFAT-UTILS_TMP)
 	$(UNTAR)/$(EXFAT-UTILS_SOURCE)
 	$(CHDIR)/$(EXFAT-UTILS_TMP); \
@@ -1439,7 +1494,9 @@ $(D)/exfat-utils: $(D)/fuse-exfat $(ARCHIVE)/$(EXFAT-UTILS_SOURCE) | $(TARGET_DI
 
 # -----------------------------------------------------------------------------
 
-$(D)/streamripper: $(D)/libvorbisidec $(D)/libmad $(D)/glib2 | $(TARGET_DIR)
+STREAMRIPPER_DEPS   = $(D)/libvorbisidec $(D)/libmad $(D)/glib2
+
+$(D)/streamripper: $(STREAMRIPPER_DEPS) | $(TARGET_DIR)
 	$(REMOVE)/$(NI-STREAMRIPPER)
 	tar -C $(SOURCE_DIR) -cp $(NI-STREAMRIPPER) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	$(CHDIR)/$(NI-STREAMRIPPER); \
@@ -1501,7 +1558,9 @@ MC_URL    = ftp.midnight-commander.org
 $(ARCHIVE)/$(MC_SOURCE):
 	$(DOWNLOAD) $(MC_URL)/$(MC_SOURCE)
 
-$(D)/mc: $(D)/glib2 $(D)/ncurses $(ARCHIVE)/$(MC_SOURCE) | $(TARGET_DIR)
+MC_DEPS   = $(D)/glib2 $(D)/ncurses
+
+$(D)/mc: $(MC_DEPS) $(ARCHIVE)/$(MC_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(MC_TMP)
 	$(UNTAR)/$(MC_SOURCE)
 	$(CHDIR)/$(MC_TMP); \
@@ -1544,7 +1603,9 @@ WGET_PATCH  = wget-remove-hardcoded-engine-support-for-openssl.patch
 WGET_PATCH += wget-set-check_cert-false-by-default.patch
 WGET_PATCH += wget-change_DEFAULT_LOGFILE.patch
 
-$(D)/wget: $(D)/openssl $(ARCHIVE)/$(WGET_SOURCE) | $(TARGET_DIR)
+WGET_DEPS   = $(D)/openssl
+
+$(D)/wget: $(WGET_DEPS) $(ARCHIVE)/$(WGET_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(WGET_TMP)
 	$(UNTAR)/$(WGET_SOURCE)
 	$(CHDIR)/$(WGET_TMP); \
@@ -1618,7 +1679,9 @@ AIO-GRAB_TMP    = aio-grab.$(AIO-GRAB_VER)
 AIO-GRAB_SOURCE = aio-grab.$(AIO-GRAB_VER)
 AIO-GRAB_URL    = https://github.com/oe-alliance
 
-$(D)/aio-grab: $(D)/zlib $(D)/libpng $(D)/libjpeg | $(TARGET_DIR)
+AIO-GRAB_DEPS   = $(D)/zlib $(D)/libpng $(D)/libjpeg
+
+$(D)/aio-grab: $(AIO-GRAB_DEPS) | $(TARGET_DIR)
 	$(REMOVE)/$(AIO-GRAB_TMP)
 	$(GET-GIT-SOURCE) $(AIO-GRAB_URL)/$(AIO-GRAB_SOURCE) $(ARCHIVE)/$(AIO-GRAB_SOURCE)
 	$(CPDIR)/$(AIO-GRAB_SOURCE)
@@ -1696,7 +1759,9 @@ $(ARCHIVE)/$(GPTFDISK_SOURCE):
 
 GPTFDISK_PATCH  = gptfdisk-ldlibs.patch
 
-$(D)/gptfdisk: $(D)/popt $(D)/e2fsprogs $(ARCHIVE)/$(GPTFDISK_SOURCE) | $(TARGET_DIR)
+GPTFDISK_DEPS   = $(D)/popt $(D)/e2fsprogs
+
+$(D)/gptfdisk: $(GPTFDISK_DEPS) $(ARCHIVE)/$(GPTFDISK_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(GPTFDISK_TMP)
 	$(UNTAR)/$(GPTFDISK_SOURCE)
 	$(CHDIR)/$(GPTFDISK_TMP); \
@@ -1719,7 +1784,9 @@ RSYNC_URL    = https://ftp.samba.org/pub/rsync
 $(ARCHIVE)/$(RSYNC_SOURCE):
 	$(DOWNLOAD) $(RSYNC_URL)/$(RSYNC_SOURCE)
 
-$(D)/rsync: $(D)/zlib $(D)/popt $(ARCHIVE)/$(RSYNC_SOURCE) | $(TARGET_DIR)
+RSYNC_DEPS   = $(D)/zlib $(D)/popt
+
+$(D)/rsync: $(RSYNC_DEPS) $(ARCHIVE)/$(RSYNC_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(RSYNC_TMP)
 	$(UNTAR)/$(RSYNC_SOURCE)
 	$(CHDIR)/$(RSYNC_TMP); \