- drop $(D) variable from targets and dependencies; it's covered by $(VPATH) variable

6 years ago · 4d1e76c6df
16 changed files with 275 additions and 275 deletions
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@ -4,7 +4,7 @@
 # -----------------------------------------------------------------------------
 BOOTSTRAP  = target-dir
-BOOTSTRAP += $(D)
+BOOTSTRAP += $(DEPS_DIR)
 BOOTSTRAP += $(BUILD_TMP)
 BOOTSTRAP += $(STAGING_DIR)
 BOOTSTRAP += $(IMAGE_DIR)
@ -67,7 +67,7 @@ $(TARGET_DIR):
 	$(call draw_line);
 	@false
-$(D) \
+$(DEPS_DIR) \
 $(BUILD_TMP) \
 $(STAGING_DIR) \
 $(IMAGE_DIR) \
--- a/make/clean.mk
+++ b/make/clean.mk
@ -49,7 +49,7 @@ clean: rebuild-clean bootstrap
 clean-all: update-all staging-clean clean
 %-clean:
-	-find $(D) -name $(subst -clean,,$(@)) -delete
+	-find $(DEPS_DIR) -name $(subst -clean,,$(@)) -delete
 # -----------------------------------------------------------------------------
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@ -334,7 +334,7 @@ CD    = set -e; cd
 CHDIR = $(CD) $(BUILD_TMP)
 MKDIR = mkdir -p $(BUILD_TMP)
 CPDIR = cp -a -t $(BUILD_TMP) $(ARCHIVE)
-TOUCH = @touch $(@)
+TOUCH = @touch $(D)/$(@)
 INSTALL      = install
 INSTALL_DATA = $(INSTALL) -m 0644
--- a/make/linux-drivers.mk
+++ b/make/linux-drivers.mk
@ -7,7 +7,7 @@ RTL8192EU_VER = git
 RTL8192EU_SOURCE = rtl8192eu-linux-driver.$(RTL8192EU_VER)
 RTL8192EU_URL = https://github.com/mange/$(RTL8192EU_SOURCE)
-$(D)/rtl8192eu: $(D)/kernel-$(BOXTYPE) | $(TARGET_DIR)
+rtl8192eu: kernel-$(BOXTYPE) | $(TARGET_DIR)
 	$(REMOVE)/$(RTL8192EU_SOURCE)
 	$(GET-GIT-SOURCE) $(RTL8192EU_URL) $(ARCHIVE)/$(RTL8192EU_SOURCE)
 	$(CPDIR)/$(RTL8192EU_SOURCE)
--- a/make/linux-kernel.mk
+++ b/make/linux-kernel.mk
@ -55,7 +55,7 @@ kernel.do_checkout: $(SOURCE_DIR)/$(NI-LINUX-KERNEL)
 	$(CD) $(SOURCE_DIR)/$(NI-LINUX-KERNEL); \
 		git checkout $(KERNEL_BRANCH)
-$(D)/kernel.do_prepare:
+kernel.do_prepare:
 	make kernel.do_checkout
 	#
 	$(REMOVE)/$(KERNEL_SRC)
@ -76,7 +76,7 @@ else ifeq ($(BOXTYPE), armbox)
 endif
 	$(TOUCH)
-$(D)/kernel.do_compile: $(D)/kernel.do_prepare
+kernel.do_compile: kernel.do_prepare
 	$(CHDIR)/$(KERNEL_SRC); \
 		$(MAKE) $(KERNEL_MAKEVARS) silentoldconfig; \
 		$(MAKE) $(KERNEL_MAKEVARS) $(KERNEL_MAKEOPTS); \
@ -88,20 +88,20 @@ endif
 # -----------------------------------------------------------------------------
-$(D)/kernel: $(D)/kernel-$(BOXTYPE) $(D)/kernel-modules-$(BOXTYPE)
+kernel: kernel-$(BOXTYPE) kernel-modules-$(BOXTYPE)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
-$(D)/kernel-coolstream: $(D)/kernel-coolstream-$(BOXSERIES)
+kernel-coolstream: kernel-coolstream-$(BOXSERIES)
 	$(TOUCH)
-$(D)/kernel-coolstream-hd1: $(D)/kernel.do_compile | $(IMAGE_DIR)
+kernel-coolstream-hd1: kernel.do_compile | $(IMAGE_DIR)
 	mkimage -A $(BOXARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(KERNEL_UIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-uImage.img
 	mkimage -A $(BOXARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img
 	$(TOUCH)
-$(D)/kernel-coolstream-hd2: $(D)/kernel.do_compile | $(IMAGE_DIR)
+kernel-coolstream-hd2: kernel.do_compile | $(IMAGE_DIR)
 	mkimage -A $(BOXARCH) -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE_DTB) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz
 ifeq ($(BOXFAMILY), apollo)
  ifeq ($(BOXMODEL), apollo)
@ -112,13 +112,13 @@ ifeq ($(BOXFAMILY), apollo)
 endif
 	$(TOUCH)
-$(D)/kernel-armbox: $(D)/kernel.do_compile | $(IMAGE_DIR)
+kernel-armbox: kernel.do_compile | $(IMAGE_DIR)
 	cp -a $(KERNEL_ZIMAGE_DTB) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL).bin
 	$(TOUCH)
 # -----------------------------------------------------------------------------
-$(D)/kernel-modules-coolstream: $(D)/kernel-modules-coolstream-$(BOXSERIES)
+kernel-modules-coolstream: kernel-modules-coolstream-$(BOXSERIES)
 	$(TOUCH)
 STRIP-MODULES-COOLSTREAM-HD1  =
@ -133,7 +133,7 @@ STRIP-MODULES-COOLSTREAM-HD1 += kernel/fs/autofs4/autofs4.ko
 STRIP-MODULES-COOLSTREAM-HD1 += kernel/fs/cifs/cifs.ko
 STRIP-MODULES-COOLSTREAM-HD1 += kernel/fs/fuse/fuse.ko
-$(D)/kernel-modules-coolstream-hd1: $(D)/kernel-coolstream
+kernel-modules-coolstream-hd1: kernel-coolstream
 	for module in $(STRIP-MODULES-COOLSTREAM-HD1); do \
 		mkdir -p $(TARGET_MODULES_DIR)/$(dir "$$module"); \
 		$(TARGET_OBJCOPY) --strip-unneeded $(KERNEL_MODULES_DIR)/$$module $(TARGET_MODULES_DIR)/$$module; \
@ -142,7 +142,7 @@ $(D)/kernel-modules-coolstream-hd1: $(D)/kernel-coolstream
 	make depmod
 	$(TOUCH)
-$(D)/kernel-modules-coolstream-hd2: $(D)/kernel-coolstream
+kernel-modules-coolstream-hd2: kernel-coolstream
 	rm -rf $(TARGET_MODULES_DIR)/kernel # nuke coolstream kernel-drivers but leave coolstream extra-drivers
 	cp -a $(KERNEL_MODULES_DIR)/kernel $(TARGET_MODULES_DIR) # copy own kernel-drivers
 	cp -a $(KERNEL_MODULES_DIR)/modules.builtin $(TARGET_MODULES_DIR)
@ -151,7 +151,7 @@ $(D)/kernel-modules-coolstream-hd2: $(D)/kernel-coolstream
 	make rtl8192eu
 	$(TOUCH)
-$(D)/kernel-modules-armbox: $(D)/kernel-armbox
+kernel-modules-armbox: kernel-armbox
 	cp -a $(KERNEL_MODULES_DIR)/kernel $(TARGET_MODULES_DIR)
 	cp -a $(KERNEL_MODULES_DIR)/modules.builtin $(TARGET_MODULES_DIR)
 	cp -a $(KERNEL_MODULES_DIR)/modules.order $(TARGET_MODULES_DIR)
@ -181,10 +181,10 @@ endif
 kernel-install-coolstream: kernel-install-coolstream-$(BOXSERIES)
-kernel-install-coolstream-hd1: $(D)/kernel-coolstream-hd1
+kernel-install-coolstream-hd1: kernel-coolstream-hd1
 	cp -af $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img $(KERNEL_DESTDIR)/zImage
-kernel-install-coolstream-hd2: $(D)/kernel-coolstream-hd2
+kernel-install-coolstream-hd2: kernel-coolstream-hd2
 	cp -af $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(KERNEL_DESTDIR)/vmlinux.ub.gz
 kernel-install-coolstream-all:
--- a/make/neutrino-plugins.mk
+++ b/make/neutrino-plugins.mk
@ -4,10 +4,10 @@
 # -----------------------------------------------------------------------------
 plugins: \
-	$(D)/neutrino-plugins \
+	neutrino-plugins \
-	$(D)/logo-addon \
+	logo-addon \
-	$(D)/neutrino-mediathek \
+	neutrino-mediathek \
-	$(D)/doscam-webif-skin
+	doscam-webif-skin
 	make plugins-$(BOXSERIES)
 plugins-hd1:
@ -16,7 +16,7 @@ plugins-hd1:
 plugins-hd2 \
 plugins-hd51 \
 plugins-bre2ze4k: \
-	$(D)/channellogos
+	channellogos
 ifneq ($(BOXMODEL), kronos_v2)
 	make links
 endif
@ -25,17 +25,17 @@ endif
 NP_OBJ_DIR = $(BUILD_TMP)/$(NI-NEUTRINO-PLUGINS)
-NP_DEPS  = $(D)/ffmpeg
+NP_DEPS  = ffmpeg
-NP_DEPS += $(D)/libcurl
+NP_DEPS += libcurl
-NP_DEPS += $(D)/libpng
+NP_DEPS += libpng
-NP_DEPS += $(D)/libjpeg
+NP_DEPS += libjpeg
-NP_DEPS += $(D)/giflib
+NP_DEPS += giflib
-NP_DEPS += $(D)/freetype
+NP_DEPS += freetype
-NP_DEPS += $(D)/luaexpat
+NP_DEPS += luaexpat
-NP_DEPS += $(D)/luajson
+NP_DEPS += luajson
-NP_DEPS += $(D)/luacurl
+NP_DEPS += luacurl
-NP_DEPS += $(D)/luaposix
+NP_DEPS += luaposix
-NP_DEPS += $(D)/lua-feedparser
+NP_DEPS += lua-feedparser
 NP_CONFIGURE_ADDITIONS = \
 		--disable-logoupdater \
@ -74,7 +74,7 @@ $(NP_OBJ_DIR)/config.status: $(NP_DEPS)
 # -----------------------------------------------------------------------------
-$(D)/neutrino-plugins: $(D)/neutrino $(NP_OBJ_DIR)/config.status
+neutrino-plugins: neutrino $(NP_OBJ_DIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
 	$(MAKE) -C $(NP_OBJ_DIR) all     DESTDIR=$(TARGET_DIR)
 	$(MAKE) -C $(NP_OBJ_DIR) install DESTDIR=$(TARGET_DIR)
@ -106,7 +106,7 @@ neutrino-plugin-%: $(NP_OBJ_DIR)/config.status
 # -----------------------------------------------------------------------------
-$(D)/channellogos: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHAREICONS)
+channellogos: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHAREICONS)
 	rm -rf $(SHAREICONS)/logo
 	mkdir -p $(SHAREICONS)/logo
 	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logos/* $(SHAREICONS)/logo
@ -118,7 +118,7 @@ $(D)/channellogos: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHAREICONS)
 # -----------------------------------------------------------------------------
-$(D)/logo-addon: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHAREPLUGINS)
+logo-addon: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHAREPLUGINS)
 	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.sh $(SHAREPLUGINS)/
 	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.cfg $(SHAREPLUGINS)/
 	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.png $(SHAREPLUGINS)/
@ -126,7 +126,7 @@ $(D)/logo-addon: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHAREPLUGINS)
 # -----------------------------------------------------------------------------
-$(D)/doscam-webif-skin:
+doscam-webif-skin:
 	$(INSTALL_DATA) -D $(IMAGEFILES)/doscam-webif-skin/doscam_ni-dark.css $(TARGET_SHARE_DIR)/doscam/skin/doscam_ni-dark.css
 	$(INSTALL_DATA) -D $(IMAGEFILES)/doscam-webif-skin/IC_doscam_ni.tpl $(TARGET_SHARE_DIR)/doscam/tpl/IC_doscam_ni.tpl
 	$(TOUCH)
@ -138,7 +138,7 @@ NEUTRINO-MEDIATHEK_TMP    = mediathek.$(NEUTRINO-MEDIATHEK_VER)
 NEUTRINO-MEDIATHEK_SOURCE = mediathek.$(NEUTRINO-MEDIATHEK_VER)
 NEUTRINO-MEDIATHEK_URL    = https://github.com/neutrino-mediathek
-$(D)/neutrino-mediathek: $(SHAREPLUGINS) | $(TARGET_DIR)
+neutrino-mediathek: $(SHAREPLUGINS) | $(TARGET_DIR)
 	$(REMOVE)/$(NEUTRINO-MEDIATHEK_TMP)
 	$(GET-GIT-SOURCE) $(NEUTRINO-MEDIATHEK_URL)/$(NEUTRINO-MEDIATHEK_SOURCE) $(ARCHIVE)/$(NEUTRINO-MEDIATHEK_SOURCE)
 	$(CPDIR)/$(NEUTRINO-MEDIATHEK_SOURCE)
@ -163,7 +163,7 @@ LINKS_PATCH += links-ac-prog-cxx.patch
 LINKS_PATCH += links-input-$(BOXTYPE).patch
 LINKS_PATCH += links-accept_https_play.patch
-$(D)/links: $(D)/libpng $(D)/libjpeg $(D)/openssl $(ARCHIVE)/$(LINKS_SOURCE) $(SHAREPLUGINS) | $(TARGET_DIR)
+links: libpng libjpeg openssl $(ARCHIVE)/$(LINKS_SOURCE) $(SHAREPLUGINS) | $(TARGET_DIR)
 	$(REMOVE)/$(LINKS_TMP)
 	$(UNTAR)/$(LINKS_SOURCE)
 	$(CHDIR)/$(LINKS_TMP)/intl; \
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@ -9,34 +9,34 @@ N_OBJ_DIR = $(BUILD_TMP)/$(NI-NEUTRINO)
 # -----------------------------------------------------------------------------
 N_DEPS  =
-N_DEPS += $(D)/ffmpeg
+N_DEPS += ffmpeg
-N_DEPS += $(D)/freetype
+N_DEPS += freetype
-N_DEPS += $(D)/giflib
+N_DEPS += giflib
-N_DEPS += $(D)/libcurl
+N_DEPS += libcurl
-N_DEPS += $(D)/libdvbsi
+N_DEPS += libdvbsi
-N_DEPS += $(D)/fribidi
+N_DEPS += fribidi
-N_DEPS += $(D)/libjpeg
+N_DEPS += libjpeg
-N_DEPS += $(D)/libsigc++
+N_DEPS += libsigc++
-N_DEPS += $(D)/lua
+N_DEPS += lua
-N_DEPS += $(D)/ntp
+N_DEPS += ntp
-N_DEPS += $(D)/openssl
+N_DEPS += openssl
-N_DEPS += $(D)/openthreads
+N_DEPS += openthreads
-N_DEPS += $(D)/pugixml
+N_DEPS += pugixml
-N_DEPS += $(D)/zlib
+N_DEPS += zlib
 ifeq ($(BOXTYPE)-$(HAS_LIBCS), coolstream-yes)
-  N_DEPS += $(D)/libcoolstream
+  N_DEPS += libcoolstream
 endif
 ifneq ($(BOXTYPE), coolstream)
-  N_DEPS += $(D)/libstb-hal
+  N_DEPS += libstb-hal
 endif
 # uncomment next lines to build neutrino without --enable-ffmpegdec
-#N_DEPS += $(D)/libFLAC
+#N_DEPS += libFLAC
-#N_DEPS += $(D)/libid3tag
+#N_DEPS += libid3tag
-#N_DEPS += $(D)/libmad
+#N_DEPS += libmad
-#N_DEPS += $(D)/libvorbisidec
+#N_DEPS += libvorbisidec
 # -----------------------------------------------------------------------------
@ -164,7 +164,7 @@ $(N_OBJ_DIR)/config.status: $(N_DEPS)
 # -----------------------------------------------------------------------------
-$(D)/neutrino: $(N_OBJ_DIR)/config.status
+neutrino: $(N_OBJ_DIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
 	$(MAKE) -C $(N_OBJ_DIR) all     DESTDIR=$(TARGET_DIR)
 	$(MAKE) -C $(N_OBJ_DIR) install DESTDIR=$(N_INST_DIR)
@ -183,13 +183,13 @@ LH_OBJ_DIR = $(BUILD_TMP)/$(NI-LIBSTB-HAL)
 # -----------------------------------------------------------------------------
 LH_DEPS  =
-LH_DEPS += $(D)/ffmpeg
+LH_DEPS += ffmpeg
-LH_DEPS += $(D)/openthreads
+LH_DEPS += openthreads
 USE_GSTREAMER = no
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
  ifeq ($(USE_GSTREAMER), yes)
-    LH_DEPS += $(D)/gstreamer-all
+    LH_DEPS += gstreamer-all
  endif
 endif
@ -226,7 +226,7 @@ $(LH_OBJ_DIR)/config.status: $(LH_DEPS)
 # -----------------------------------------------------------------------------
-$(D)/libstb-hal: $(LH_OBJ_DIR)/config.status
+libstb-hal: $(LH_OBJ_DIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
 	$(MAKE) -C $(LH_OBJ_DIR) all     DESTDIR=$(TARGET_DIR)
 	$(MAKE) -C $(LH_OBJ_DIR) install DESTDIR=$(N_INST_DIR)
--- a/make/target-development.mk
+++ b/make/target-development.mk
@ -5,7 +5,7 @@
 VALGRIND_TARGET = $(if $(filter $(BOXSERIES), hd1), valgrind12305, valgrind3)
-$(D)/valgrind: $(VALGRIND_TARGET)
+valgrind: $(VALGRIND_TARGET)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
@ -20,7 +20,7 @@ $(ARCHIVE)/$(VALGRIND_SOURCE):
 VALGRIND_PATCH  = valgrind-fix-build-$(BOXSERIES).patch
-$(D)/valgrind3: $(ARCHIVE)/$(VALGRIND_SOURCE) | $(TARGET_DIR)
+valgrind3: $(ARCHIVE)/$(VALGRIND_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(VALGRIND_TMP)
 	$(UNTAR)/$(VALGRIND_SOURCE)
 	$(CHDIR)/$(VALGRIND_TMP); \
@ -46,7 +46,7 @@ $(D)/valgrind3: $(ARCHIVE)/$(VALGRIND_SOURCE) | $(TARGET_DIR)
 VALGRIND12305_PATCH  = valgrind12305-nevis-patch.diff
 VALGRIND12305_PATCH += valgrind12305-automake-1.11.2.patch
-$(D)/valgrind12305: | $(TARGET_DIR)
+valgrind12305: | $(TARGET_DIR)
 	$(REMOVE)/valgrind
 	svn co -r 12305 svn://svn.valgrind.org/valgrind/trunk $(BUILD_TMP)/valgrind; \
 	$(CHDIR)/valgrind; \
@ -75,7 +75,7 @@ STRACE_URL    = https://strace.io/files/$(STRACE_VER)
 $(ARCHIVE)/$(STRACE_SOURCE):
 	$(DOWNLOAD) $(STRACE_URL)/$(STRACE_SOURCE)
-$(D)/strace: $(ARCHIVE)/$(STRACE_SOURCE) | $(TARGET_DIR)
+strace: $(ARCHIVE)/$(STRACE_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(STRACE_TMP)
 	$(UNTAR)/$(STRACE_SOURCE)
 	$(CHDIR)/$(STRACE_TMP); \
@ -100,9 +100,9 @@ GDB_URL    = https://sourceware.org/pub/gdb/releases
 $(ARCHIVE)/$(GDB_SOURCE):
 	$(DOWNLOAD) $(GDB_URL)/$(GDB_SOURCE)
-GDB_DEPS   = $(D)/zlib $(D)/ncurses
+GDB_DEPS   = zlib ncurses
-$(D)/gdb: $(GDB_DEPS) $(ARCHIVE)/$(GDB_SOURCE) | $(TARGET_DIR)
+gdb: $(GDB_DEPS) $(ARCHIVE)/$(GDB_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(GDB_TMP)
 	$(UNTAR)/$(GDB_SOURCE)
 	$(CHDIR)/$(GDB_TMP); \
--- a/make/target-ffmpeg-armbox.mk
+++ b/make/target-ffmpeg-armbox.mk
@ -24,7 +24,7 @@ FFMPEG_UNPATCHED := no
 # -----------------------------------------------------------------------------
-FFMPEG_DEPS = $(D)/openssl $(D)/freetype $(D)/rtmpdump $(D)/libbluray $(D)/libass $(D)/libxml2 $(D)/alsa-lib
+FFMPEG_DEPS = openssl freetype rtmpdump libbluray libass libxml2 alsa-lib
 # -----------------------------------------------------------------------------
@ -344,7 +344,7 @@ FFMPEG_CONFIGURE_PLATFORM = \
 # -----------------------------------------------------------------------------
-$(D)/ffmpeg: $(FFMPEG_DEPS) $(ARCHIVE)/$(FFMPEG_SOURCE) | $(TARGET_DIR)
+ffmpeg: $(FFMPEG_DEPS) $(ARCHIVE)/$(FFMPEG_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(FFMPEG_TMP)
 	$(UNTAR)/$(FFMPEG_SOURCE)
 ifneq ($(FFMPEG_UNPATCHED), yes)
--- a/make/target-ffmpeg-coolstream.mk
+++ b/make/target-ffmpeg-coolstream.mk
@ -3,15 +3,15 @@
 #
 # -----------------------------------------------------------------------------
-FFMPEG_DEPS = $(D)/openssl $(D)/rtmpdump $(D)/libbluray $(D)/libass
+FFMPEG_DEPS = openssl rtmpdump libbluray libass
 # -----------------------------------------------------------------------------
 ifeq ($(NI-FFMPEG_BRANCH), ni/ffmpeg/2.8)
-  FFMPEG_DEPS += $(D)/libroxml
+  FFMPEG_DEPS += libroxml
  FFMPEG_CONFIGURE_BRANCH =
 else
-  FFMPEG_DEPS +=  $(D)/libxml2
+  FFMPEG_DEPS +=  libxml2
  FFMPEG_CONFIGURE_BRANCH =	\
 			--enable-demuxer=dash \
 			--enable-libxml2
@ -170,7 +170,7 @@ endif
 # -----------------------------------------------------------------------------
-$(D)/ffmpeg: $(FFMPEG_DEPS) | $(TARGET_DIR)
+ffmpeg: $(FFMPEG_DEPS) | $(TARGET_DIR)
 	$(REMOVE)/$(NI-FFMPEG)
 	$(CD) $(SOURCE_DIR)/$(NI-FFMPEG); \
 		git checkout $(NI-FFMPEG_BRANCH)
--- a/make/target-gstreamer-unused.mk
+++ b/make/target-gstreamer-unused.mk
@ -4,13 +4,13 @@
 # -----------------------------------------------------------------------------
 gstreamer-all: \
-	$(D)/gstreamer \
+	gstreamer \
-	$(D)/gst-plugins-base \
+	gst-plugins-base \
-	$(D)/gst-plugins-good \
+	gst-plugins-good \
-	$(D)/gst-plugins-bad \
+	gst-plugins-bad \
-	$(D)/gst-plugins-ugly \
+	gst-plugins-ugly \
-	$(D)/gst-plugin-subsink \
+	gst-plugin-subsink \
-	$(D)/gst-plugin-dvbmediasink
+	gst-plugin-dvbmediasink
 # -----------------------------------------------------------------------------
@ -35,7 +35,7 @@ $(ARCHIVE)/$(GSTREAMER_SOURCE):
 GSTREAMER_PATCH  = gstreamer-$(GSTREAMER_VER)-revert-use-new-gst-adapter-get-buffer.patch
-$(D)/gstreamer: $(D)/glib2 $(D)/libxml2 $(D)/glib-networking $(ARCHIVE)/$(GSTREAMER_SOURCE)
+gstreamer: glib2 libxml2 glib-networking $(ARCHIVE)/$(GSTREAMER_SOURCE)
 	$(REMOVE)/gstreamer-$(GSTREAMER_VER)
 	$(UNTAR)/$(GSTREAMER_SOURCE)
 	$(CHDIR)/gstreamer-$(GSTREAMER_VER); \
@ -90,7 +90,7 @@ GST_PLUGINS_BASE_PATCH += gst-plugins-base-$(GST_PLUGINS_BASE_VER)-0004-subparse
 GST_PLUGINS_BASE_PATCH += gst-plugins-base-$(GST_PLUGINS_BASE_VER)-make-gio_unix_2_0-dependency-configurable.patch
 GST_PLUGINS_BASE_PATCH += gst-plugins-base-$(GST_PLUGINS_BASE_VER)-0003-riff-media-added-fourcc-to-all-ffmpeg-mpeg4-video-caps.patch
-$(D)/gst-plugins-base: $(ARCHIVE)/$(GST_PLUGINS_BASE_SOURCE) $(D)/gstreamer $(D)/zlib $(D)/glib2 $(D)/orc $(D)/alsa-lib $(D)/libogg $(D)/libvorbisidec | $(TARGET_DIR)
+gst-plugins-base: $(ARCHIVE)/$(GST_PLUGINS_BASE_SOURCE) gstreamer zlib glib2 orc alsa-lib libogg libvorbisidec | $(TARGET_DIR)
 	$(REMOVE)/gst-plugins-base-$(GST_PLUGINS_BASE_VER)
 	$(UNTAR)/$(GST_PLUGINS_BASE_SOURCE)
 	$(CHDIR)/gst-plugins-base-$(GST_PLUGINS_BASE_VER); \
@ -146,7 +146,7 @@ $(ARCHIVE)/$(GST_PLUGINS_GOOD_SOURCE):
 GST_PLUGINS_GOOD_PATCH  = gst-plugins-good-$(GST_PLUGINS_GOOD_VER)-0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch
-$(D)/gst-plugins-good: $(ARCHIVE)/$(GST_PLUGINS_GOOD_SOURCE) $(D)/gst-plugins-base $(D)/libpng $(D)/libjpeg $(D)/libsoup $(D)/libFLAC | $(TARGET_DIR)
+gst-plugins-good: $(ARCHIVE)/$(GST_PLUGINS_GOOD_SOURCE) gst-plugins-base libpng libjpeg libsoup libFLAC | $(TARGET_DIR)
 	$(REMOVE)/gst-plugins-good-$(GST_PLUGINS_GOOD_VER)
 	$(UNTAR)/$(GST_PLUGINS_GOOD_SOURCE)
 	$(CHDIR)/gst-plugins-good-$(GST_PLUGINS_GOOD_VER); \
@ -186,7 +186,7 @@ GST_PLUGINS_BAD_PATCH += gst-plugins-bad-$(GST_PLUGINS_BAD_VER)-0004-rtmp-hls-ts
 GST_PLUGINS_BAD_PATCH += gst-plugins-bad-$(GST_PLUGINS_BAD_VER)-dvbapi5-fix-old-kernel.patch
 GST_PLUGINS_BAD_PATCH += gst-plugins-bad-$(GST_PLUGINS_BAD_VER)-hls-main-thread-block.patch
-$(D)/gst-plugins-bad: $(ARCHIVE)/$(GST_PLUGINS_BAD_SOURCE) $(D)/gst-plugins-base $(D)/libass $(D)/libcurl $(D)/libxml2 $(D)/openssl $(D)/rtmpdump | $(TARGET_DIR)
+gst-plugins-bad: $(ARCHIVE)/$(GST_PLUGINS_BAD_SOURCE) gst-plugins-base libass libcurl libxml2 openssl rtmpdump | $(TARGET_DIR)
 	$(REMOVE)/gst-plugins-bad-$(GST_PLUGINS_BAD_VER)
 	$(UNTAR)/$(GST_PLUGINS_BAD_SOURCE)
 	$(CHDIR)/gst-plugins-bad-$(GST_PLUGINS_BAD_VER); \
@ -239,7 +239,7 @@ GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VER).tar.xz
 $(ARCHIVE)/$(GST_PLUGINS_UGLY_SOURCE):
 	$(DOWNLOAD) https://gstreamer.freedesktop.org/src/gst-plugins-ugly/$(GST_PLUGINS_UGLY_SOURCE)
-$(D)/gst-plugins-ugly: $(ARCHIVE)/$(GST_PLUGINS_UGLY_SOURCE) $(D)/gst-plugins-base | $(TARGET_DIR)
+gst-plugins-ugly: $(ARCHIVE)/$(GST_PLUGINS_UGLY_SOURCE) gst-plugins-base | $(TARGET_DIR)
 	$(REMOVE)/gst-plugins-ugly-$(GST_PLUGINS_UGLY_VER)
 	$(UNTAR)/$(GST_PLUGINS_UGLY_SOURCE)
 	$(CHDIR)/gst-plugins-ugly-$(GST_PLUGINS_UGLY_VER); \
@ -265,7 +265,7 @@ $(D)/gst-plugins-ugly: $(ARCHIVE)/$(GST_PLUGINS_UGLY_SOURCE) $(D)/gst-plugins-ba
 GST_PLUGIN_SUBSINK_VER = 1.0
-$(D)/gst-plugin-subsink: $(D)/gst-plugins-base | $(TARGET_DIR)
+gst-plugin-subsink: gst-plugins-base | $(TARGET_DIR)
 	$(REMOVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git
 	$(GET-GIT-SOURCE) git://github.com/christophecvr/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git $(ARCHIVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git
 	$(CPDIR)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git
@ -291,7 +291,7 @@ $(D)/gst-plugin-subsink: $(D)/gst-plugins-base | $(TARGET_DIR)
 GST_PLUGINS_DVBMEDIASINK_VER = 1.0
-$(D)/gst-plugin-dvbmediasink: $(D)/gst-plugins-base $(D)/libdca | $(TARGET_DIR)
+gst-plugin-dvbmediasink: gst-plugins-base libdca | $(TARGET_DIR)
 	$(REMOVE)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git
 	$(GET-GIT-SOURCE) https://github.com/OpenPLi/gst-plugin-dvbmediasink.git $(ARCHIVE)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git
 	$(CPDIR)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git
@ -338,7 +338,7 @@ GST_LIBAV_PATCH += gst-libav-$(GST_LIBAV_VER)-workaround-to-build-gst-libav-for-
 GST_LIBAV_PATCH += gst-libav-$(GST_LIBAV_VER)-mips64_cpu_detection.patch
 GST_LIBAV_PATCH += gst-libav-$(GST_LIBAV_VER)-0001-configure-check-for-armv7ve-variant.patch
-$(D)/gst_libav: $(ARCHIVE)/$(GST_LIBAV_SOURCE) $(D)/gstreamer $(D)/gst-plugins-base | $(TARGET_DIR)
+gst_libav: $(ARCHIVE)/$(GST_LIBAV_SOURCE) gstreamer gst-plugins-base | $(TARGET_DIR)
 	$(REMOVE)/gst-libav-$(GST_LIBAV_VER)
 	$(UNTAR)/$(GST_LIBAV_SOURCE)
 	$(CHDIR)/gst-libav-$(GST_LIBAV_VER); \
@ -388,7 +388,7 @@ $(D)/gst_libav: $(ARCHIVE)/$(GST_LIBAV_SOURCE) $(D)/gstreamer $(D)/gst-plugins-b
 # -----------------------------------------------------------------------------
-$(D)/gmrender-resurrect: $(D)/gst-plugins-base $(D)/libupnp | $(TARGET_DIR)
+gmrender-resurrect: gst-plugins-base libupnp | $(TARGET_DIR)
 	$(REMOVE)/gmrender-resurrect.git
 	$(GET-GIT-SOURCE) https://github.com/hzeller/gmrender-resurrect.git $(ARCHIVE)/gmrender-resurrect.git
 	$(CPDIR)/gmrender-resurrect.git
@ -409,7 +409,7 @@ ORC_SOURCE = orc-$(ORC_VER).tar.xz
 $(ARCHIVE)/$(ORC_SOURCE):
 	$(DOWNLOAD) https://gstreamer.freedesktop.org/src/orc/$(ORC_SOURCE)
-$(D)/orc: $(ARCHIVE)/$(ORC_SOURCE)
+orc: $(ARCHIVE)/$(ORC_SOURCE)
 	$(REMOVE)/orc-$(ORC_VER)
 	$(UNTAR)/$(ORC_SOURCE)
 	$(CHDIR)/orc-$(ORC_VER); \
@ -434,7 +434,7 @@ LIBDCA_SOURCE = libdca-$(LIBDCA_VER).tar.bz2
 $(ARCHIVE)/$(LIBDCA_SOURCE):
 	$(DOWNLOAD) http://download.videolan.org/pub/videolan/libdca/$(LIBDCA_VER)/$(LIBDCA_SOURCE)
-$(D)/libdca: $(ARCHIVE)/$(LIBDCA_SOURCE)
+libdca: $(ARCHIVE)/$(LIBDCA_SOURCE)
 	$(REMOVE)/libdca-$(LIBDCA_VER)
 	$(UNTAR)/$(LIBDCA_SOURCE)
 	$(CHDIR)/libdca-$(LIBDCA_VER); \
@ -459,7 +459,7 @@ NETTLE_SOURCE = nettle-$(NETTLE_VER).tar.gz
 $(ARCHIVE)/$(NETTLE_SOURCE):
 	$(DOWNLOAD) https://ftp.gnu.org/gnu/nettle/$(NETTLE_SOURCE)
-$(D)/nettle: $(D)/gmp $(ARCHIVE)/$(NETTLE_SOURCE)
+nettle: gmp $(ARCHIVE)/$(NETTLE_SOURCE)
 	$(REMOVE)/nettle-$(NETTLE_VER)
 	$(UNTAR)/$(NETTLE_SOURCE)
 	$(CHDIR)/nettle-$(NETTLE_VER); \
@ -483,7 +483,7 @@ GMP_SOURCE = gmp-$(GMP_VER).tar.xz
 $(ARCHIVE)/$(GMP_SOURCE):
 	$(DOWNLOAD) ftp://ftp.gmplib.org/pub/gmp-$(GMP_VER)/$(GMP_SOURCE)
-$(D)/gmp: $(ARCHIVE)/$(GMP_SOURCE)
+gmp: $(ARCHIVE)/$(GMP_SOURCE)
 	$(REMOVE)/gmp-$(GMP_VER)
 	$(UNTAR)/$(GMP_SOURCE)
 	$(CHDIR)/gmp-$(GMP_VER); \
@ -507,7 +507,7 @@ GNUTLS_SOURCE = gnutls-$(GNUTLS_VER).tar.xz
 $(ARCHIVE)/$(GNUTLS_SOURCE):
 	$(DOWNLOAD) ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VER_MAJOR)/$(GNUTLS_SOURCE)
-$(D)/gnutls: $(D)/nettle $(D)/ca-bundle $(ARCHIVE)/$(GNUTLS_SOURCE)
+gnutls: nettle ca-bundle $(ARCHIVE)/$(GNUTLS_SOURCE)
 	$(REMOVE)/gnutls-$(GNUTLS_VER)
 	$(UNTAR)/$(GNUTLS_SOURCE)
 	$(CHDIR)/gnutls-$(GNUTLS_VER); \
@ -542,7 +542,7 @@ GLIB-NETWORKING_SOURCE = glib-networking-$(GLIB-NETWORKING_VER).tar.xz
 $(ARCHIVE)/$(GLIB-NETWORKING_SOURCE):
 	$(DOWNLOAD) https://ftp.acc.umu.se/pub/GNOME/sources/glib-networking/$(GLIB-NETWORKING_VER_MAJOR)/$(GLIB-NETWORKING_SOURCE)
-$(D)/glib-networking: $(D)/gnutls $(D)/glib2 $(ARCHIVE)/$(GLIB-NETWORKING_SOURCE)
+glib-networking: gnutls glib2 $(ARCHIVE)/$(GLIB-NETWORKING_SOURCE)
 	$(REMOVE)/glib-networking-$(GLIB-NETWORKING_VER)
 	$(UNTAR)/$(GLIB-NETWORKING_SOURCE)
 	$(CHDIR)/glib-networking-$(GLIB-NETWORKING_VER); \
@ -565,7 +565,7 @@ LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VER).tar.xz
 $(ARCHIVE)/$(LIBSOUP_SOURCE):
 	$(DOWNLOAD) https://download.gnome.org/sources/libsoup/$(LIBSOUP_VER_MAJOR)/$(LIBSOUP_SOURCE)
-$(D)/libsoup: $(D)/sqlite $(D)/libxml2 $(D)/glib2 $(ARCHIVE)/$(LIBSOUP_SOURCE)
+libsoup: sqlite libxml2 glib2 $(ARCHIVE)/$(LIBSOUP_SOURCE)
 	$(REMOVE)/libsoup-$(LIBSOUP_VER)
 	$(UNTAR)/$(LIBSOUP_SOURCE)
 	$(CHDIR)/libsoup-$(LIBSOUP_VER); \
@ -593,7 +593,7 @@ SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VER).tar.gz
 $(ARCHIVE)/$(SQLITE_SOURCE):
 	$(DOWNLOAD) http://www.sqlite.org/2019/$(SQLITE_SOURCE)
-$(D)/sqlite: $(ARCHIVE)/$(SQLITE_SOURCE)
+sqlite: $(ARCHIVE)/$(SQLITE_SOURCE)
 	$(REMOVE)/sqlite-autoconf-$(SQLITE_VER)
 	$(UNTAR)/$(SQLITE_SOURCE)
 	$(CHDIR)/sqlite-autoconf-$(SQLITE_VER); \
--- a/make/target-libs-unused.mk
+++ b/make/target-libs-unused.mk
@ -13,9 +13,9 @@ $(ARCHIVE)/$(LIBID3TAG_SOURCE):
 LIBID3TAG_PATCH  = libid3tag-pc.patch
-LIBID3TAG_DEPS   = $(D)/zlib
+LIBID3TAG_DEPS   = zlib
-$(D)/libid3tag: $(LIBID3TAG_DEPS) $(ARCHIVE)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR)
+libid3tag: $(LIBID3TAG_DEPS) $(ARCHIVE)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBID3TAG_TMP)
 	$(UNTAR)/$(LIBID3TAG_SOURCE)
 	$(CHDIR)/$(LIBID3TAG_TMP); \
@ -42,7 +42,7 @@ FLAC_URL    = https://ftp.osuosl.org/pub/xiph/releases/flac
 $(ARCHIVE)/$(FLAC_SOURCE):
 	$(DOWNLOAD) $(FLAC_URL)/$(FLAC_SOURCE)
-$(D)/libFLAC: $(ARCHIVE)/$(FLAC_SOURCE) | $(TARGET_DIR)
+libFLAC: $(ARCHIVE)/$(FLAC_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBFLAC_TMP)
 	$(UNTAR)/$(LIBFLAC_SOURCE)
 	$(CHDIR)/$(LIBFLAC_TMP); \
@ -76,7 +76,7 @@ LIBROXML_URL    = http://download.libroxml.net/pool/v2.x
 $(ARCHIVE)/$(LIBROXML_SOURCE):
 	$(DOWNLOAD) $(LIBROXML_URL)/$(LIBROXML_SOURCE)
-$(D)/libroxml: $(ARCHIVE)/$(LIBROXML_SOURCE) | $(TARGET_DIR)
+libroxml: $(ARCHIVE)/$(LIBROXML_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBROXML_TMP)
 	$(UNTAR)/$(LIBROXML_SOURCE)
 	$(CHDIR)/$(LIBROXML_TMP); \
@ -105,7 +105,7 @@ $(ARCHIVE)/$(BZIP2_SOURCE):
 BZIP2_PATCH  = bzip2.patch
-$(D)/bzip2: $(ARCHIVE)/$(BZIP2_SOURCE) | $(TARGET_DIR)
+bzip2: $(ARCHIVE)/$(BZIP2_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(BZIP2_TMP)
 	$(UNTAR)/$(BZIP2_SOURCE)
 	$(CHDIR)/$(BZIP2_TMP); \
@ -128,9 +128,9 @@ FONTCONFIG_URL    = https://www.freedesktop.org/software/fontconfig/release
 $(ARCHIVE)/$(FONTCONFIG_SOURCE):
 	$(DOWNLOAD) $(FONTCONFIG_URL)/$(FONTCONFIG_SOURCE)
-FONTCONFIG_DEPS   = $(D)/freetype $(D)/expat
+FONTCONFIG_DEPS   = freetype expat
-$(D)/fontconfig: $(FONTCONFIG_DEPS) $(ARCHIVE)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR)
+fontconfig: $(FONTCONFIG_DEPS) $(ARCHIVE)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(FONTCONFIG_TMP)
 	$(UNTAR)/$(FONTCONFIG_SOURCE)
 	$(CHDIR)/$(FONTCONFIG_TMP); \
@ -163,9 +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
-PIXMAN_DEPS   = $(D)/zlib $(D)/libpng
+PIXMAN_DEPS   = zlib libpng
-$(D)/pixman: $(PIXMAN_DEPS) $(ARCHIVE)/$(PIXMAN_SOURCE) | $(TARGET_DIR)
+pixman: $(PIXMAN_DEPS) $(ARCHIVE)/$(PIXMAN_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PIXMAN_TMP)
 	$(UNTAR)/$(PIXMAN_SOURCE)
 	$(CHDIR)/$(PIXMAN_TMP); \
@ -196,9 +196,9 @@ $(ARCHIVE)/$(CAIRO_SOURCE):
 CAIRO_PATCH  = cairo-get_bitmap_surface.diff
-CAIRO_DEPS   = $(D)/fontconfig $(D)/glib2 $(D)/libpng $(D)/pixman $(D)/zlib
+CAIRO_DEPS   = fontconfig glib2 libpng pixman zlib
-$(D)/cairo: $(CAIRO_DEPS) $(ARCHIVE)/$(CAIRO_SOURCE) | $(TARGET_DIR)
+cairo: $(CAIRO_DEPS) $(ARCHIVE)/$(CAIRO_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(CAIRO_TMP)
 	$(UNTAR)/$(CAIRO_SOURCE)
 	$(CHDIR)/$(CAIRO_TMP); \
@ -251,9 +251,9 @@ $(ARCHIVE)/$(HARFBUZZ_SOURCE):
 HARFBUZZ_PATCH  = harfbuzz-disable-docs.patch
-HARFBUZZ_DEPS   = $(D)/fontconfig $(D)/glib2 $(D)/cairo $(D)/freetype
+HARFBUZZ_DEPS   = fontconfig glib2 cairo freetype
-$(D)/harfbuzz: $(HARFBUZZ_DEPS) $(ARCHIVE)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR)
+harfbuzz: $(HARFBUZZ_DEPS) $(ARCHIVE)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(HARFBUZZ_TMP)
 	$(UNTAR)/$(HARFBUZZ_SOURCE)
 	$(CHDIR)/$(HARFBUZZ_TMP); \
--- a/make/target-libs.mk
+++ b/make/target-libs.mk
@ -14,7 +14,7 @@ $(ARCHIVE)/$(ZLIB_SOURCE):
 ZLIB_PATCH  = zlib-ldflags-tests.patch
 ZLIB_PATCH += zlib-remove.ldconfig.call.patch
-$(D)/zlib: $(ARCHIVE)/$(ZLIB_SOURCE) | $(TARGET_DIR)
+zlib: $(ARCHIVE)/$(ZLIB_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(ZLIB_TMP)
 	$(UNTAR)/$(ZLIB_SOURCE)
 	$(CHDIR)/$(ZLIB_TMP); \
@ -42,7 +42,7 @@ FUSE_URL    = https://github.com/libfuse/libfuse/releases/download/fuse-$(FUSE_V
 $(ARCHIVE)/$(FUSE_SOURCE):
 	$(DOWNLOAD) $(FUSE_URL)/$(FUSE_SOURCE)
-$(D)/libfuse: $(ARCHIVE)/$(FUSE_SOURCE) | $(TARGET_DIR)
+libfuse: $(ARCHIVE)/$(FUSE_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(FUSE_TMP)
 	$(UNTAR)/$(FUSE_SOURCE)
 	$(CHDIR)/$(FUSE_TMP); \
@ -77,7 +77,7 @@ LIBUPNP_URL    = http://sourceforge.net/projects/pupnp/files/pupnp/libUPnP%20$(L
 $(ARCHIVE)/$(LIBUPNP_SOURCE):
 	$(DOWNLOAD) $(LIBUPNP_URL)/$(LIBUPNP_SOURCE)
-$(D)/libupnp: $(ARCHIVE)/$(LIBUPNP_SOURCE) | $(TARGET_DIR)
+libupnp: $(ARCHIVE)/$(LIBUPNP_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBUPNP_TMP)
 	$(UNTAR)/$(LIBUPNP_SOURCE)
 	$(CHDIR)/$(LIBUPNP_TMP); \
@ -104,7 +104,7 @@ LIBDVBSI_URL    = https://github.com/OpenVisionE2
 LIBDVBSI_PATCH  = libdvbsi++-content_identifier_descriptor.patch
-$(D)/libdvbsi: | $(TARGET_DIR)
+libdvbsi: | $(TARGET_DIR)
 	$(REMOVE)/$(LIBDVBSI_TMP)
 	$(GET-GIT-SOURCE) $(LIBDVBSI_URL)/$(LIBDVBSI_SOURCE) $(ARCHIVE)/$(LIBDVBSI_SOURCE)
 	$(CPDIR)/$(LIBDVBSI_SOURCE)
@ -133,7 +133,7 @@ GIFLIB_URL    = https://sourceforge.net/projects/giflib/files
 $(ARCHIVE)/$(GIFLIB_SOURCE):
 	$(DOWNLOAD) $(GIFLIB_URL)/$(GIFLIB_SOURCE)
-$(D)/giflib: $(ARCHIVE)/$(GIFLIB_SOURCE) | $(TARGET_DIR)
+giflib: $(ARCHIVE)/$(GIFLIB_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(GIFLIB_TMP)
 	$(UNTAR)/$(GIFLIB_SOURCE)
 	$(CHDIR)/$(GIFLIB_TMP); \
@ -160,11 +160,11 @@ LIBCURL_URL    = https://curl.haxx.se/download
 $(ARCHIVE)/$(LIBCURL_SOURCE):
 	$(DOWNLOAD) $(LIBCURL_URL)/$(LIBCURL_SOURCE)
-LIBCURL_DEPS   = $(D)/zlib $(D)/openssl $(D)/rtmpdump $(D)/ca-bundle
+LIBCURL_DEPS   = zlib openssl rtmpdump ca-bundle
 LIBCURL_CONF   = $(if $(filter $(BOXSERIES), hd1), --disable-ipv6, --enable-ipv6)
-$(D)/libcurl: $(LIBCURL_DEPS) $(ARCHIVE)/$(LIBCURL_SOURCE) | $(TARGET_DIR)
+libcurl: $(LIBCURL_DEPS) $(ARCHIVE)/$(LIBCURL_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBCURL_TMP)
 	$(UNTAR)/$(LIBCURL_SOURCE)
 	$(CHDIR)/$(LIBCURL_TMP); \
@ -216,11 +216,11 @@ $(ARCHIVE)/$(LIBPNG_SOURCE):
 LIBPNG_PATCH  = libpng-Disable-pngfix-and-png-fix-itxt.patch
-LIBPNG_DEPS   = $(D)/zlib
+LIBPNG_DEPS   = zlib
 LIBPNG_CONF   = $(if $(filter $(BOXSERIES), hd51 bre2ze4k), --enable-arm-neon, --disable-arm-neon)
-$(D)/libpng: $(LIBPNG_DEPS) $(ARCHIVE)/$(LIBPNG_SOURCE) | $(TARGET_DIR)
+libpng: $(LIBPNG_DEPS) $(ARCHIVE)/$(LIBPNG_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBPNG_TMP)
 	$(UNTAR)/$(LIBPNG_SOURCE)
 	$(CHDIR)/$(LIBPNG_TMP); \
@ -255,9 +255,9 @@ FREETYPE_PATCH  = freetype2-subpixel.patch
 FREETYPE_PATCH += freetype2-config.patch
 FREETYPE_PATCH += freetype2-pkgconf.patch
-FREETYPE_DEPS   = $(D)/zlib $(D)/libpng
+FREETYPE_DEPS   = zlib libpng
-$(D)/freetype: $(FREETYPE_DEPS) $(ARCHIVE)/$(FREETYPE_SOURCE) | $(TARGET_DIR)
+freetype: $(FREETYPE_DEPS) $(ARCHIVE)/$(FREETYPE_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(FREETYPE_TMP)
 	$(UNTAR)/$(FREETYPE_SOURCE)
 	$(CHDIR)/$(FREETYPE_TMP); \
@ -294,7 +294,7 @@ $(D)/freetype: $(FREETYPE_DEPS) $(ARCHIVE)/$(FREETYPE_SOURCE) | $(TARGET_DIR)
 LIBJPEG-TURBO = $(if $(filter $(BOXTYPE), coolstream), libjpeg-turbo, libjpeg-turbo2)
-$(D)/libjpeg: $(LIBJPEG-TURBO)
+libjpeg: $(LIBJPEG-TURBO)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
@ -307,7 +307,7 @@ LIBJPEG-TURBO_URL    = https://sourceforge.net/projects/libjpeg-turbo/files/$(LI
 $(ARCHIVE)/$(LIBJPEG-TURBO_SOURCE):
 	$(DOWNLOAD) $(LIBJPEG-TURBO_URL)/$(LIBJPEG-TURBO_SOURCE)
-$(D)/libjpeg-turbo: $(ARCHIVE)/$(LIBJPEG-TURBO_SOURCE) | $(TARGET_DIR)
+libjpeg-turbo: $(ARCHIVE)/$(LIBJPEG-TURBO_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBJPEG-TURBO_TMP)
 	$(UNTAR)/$(LIBJPEG-TURBO_SOURCE)
 	$(CHDIR)/$(LIBJPEG-TURBO_TMP); \
@ -338,7 +338,7 @@ $(ARCHIVE)/$(LIBJPEG-TURBO2_SOURCE):
 LIBJPEG-TURBO2_PATCH  = libjpeg-turbo-tiff-ojpeg.patch
-$(D)/libjpeg-turbo2: $(ARCHIVE)/$(LIBJPEG-TURBO2_SOURCE) | $(TARGET_DIR)
+libjpeg-turbo2: $(ARCHIVE)/$(LIBJPEG-TURBO2_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBJPEG-TURBO2_TMP)
 	$(UNTAR)/$(LIBJPEG-TURBO2_SOURCE)
 	$(CHDIR)/$(LIBJPEG-TURBO2_TMP); \
@ -367,7 +367,7 @@ $(ARCHIVE)/$(OPENSSL_SOURCE):
 OPENSSL_PATCH  = 0000-Configure-align-O-flag.patch
-$(D)/openssl: $(ARCHIVE)/$(OPENSSL_SOURCE) | $(TARGET_DIR)
+openssl: $(ARCHIVE)/$(OPENSSL_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(OPENSSL_TMP)
 	$(UNTAR)/$(OPENSSL_SOURCE)
 	$(CHDIR)/$(OPENSSL_TMP); \
@ -429,7 +429,7 @@ $(ARCHIVE)/$(NCURSES_SOURCE):
 NCURSES_PATCH  = ncurses-gcc-5.x-MKlib_gen.patch
-$(D)/ncurses: $(ARCHIVE)/$(NCURSES_SOURCE) | $(TARGET_DIR)
+ncurses: $(ARCHIVE)/$(NCURSES_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(NCURSES_TMP)
 	$(UNTAR)/$(NCURSES_SOURCE)
 	$(CHDIR)/$(NCURSES_TMP); \
@ -467,7 +467,7 @@ $(D)/ncurses: $(ARCHIVE)/$(NCURSES_SOURCE) | $(TARGET_DIR)
 # -----------------------------------------------------------------------------
-$(D)/openthreads: $(SOURCE_DIR)/$(NI-OPENTHREADS) | $(TARGET_DIR)
+openthreads: $(SOURCE_DIR)/$(NI-OPENTHREADS) | $(TARGET_DIR)
 	$(REMOVE)/$(NI-OPENTHREADS)
 	tar -C $(SOURCE_DIR) -cp $(NI-OPENTHREADS) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	$(CHDIR)/$(NI-OPENTHREADS)/; \
@ -492,7 +492,7 @@ LIBUSB_URL    = https://sourceforge.net/projects/libusb/files/libusb-$(basename
 $(ARCHIVE)/$(LIBUSB_SOURCE):
 	$(DOWNLOAD) $(LIBUSB_URL)/$(LIBUSB_SOURCE)
-$(D)/libusb: $(ARCHIVE)/$(LIBUSB_SOURCE) | $(TARGET_DIR)
+libusb: $(ARCHIVE)/$(LIBUSB_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBUSB_TMP)
 	$(UNTAR)/$(LIBUSB_SOURCE)
 	$(CHDIR)/$(LIBUSB_TMP); \
@ -517,9 +517,9 @@ LIBUSB-COMPAT_URL    = https://sourceforge.net/projects/libusb/files/libusb-comp
 $(ARCHIVE)/$(LIBUSB-COMPAT_SOURCE):
 	$(DOWNLOAD) $(LIBUSB-COMPAT_URL)/$(LIBUSB-COMPAT_SOURCE)
-LUBUSB-COMPAT_DEPS   = $(D)/libusb
+LUBUSB-COMPAT_DEPS   = libusb
-$(D)/libusb-compat: $(LUBUSB-COMPAT_DEPS) $(ARCHIVE)/$(LIBUSB-COMPAT_SOURCE) | $(TARGET_DIR)
+libusb-compat: $(LUBUSB-COMPAT_DEPS) $(ARCHIVE)/$(LIBUSB-COMPAT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBUSB-COMPAT_TMP)
 	$(UNTAR)/$(LIBUSB-COMPAT_SOURCE)
 	$(CHDIR)/$(LIBUSB-COMPAT_TMP); \
@ -545,9 +545,9 @@ LIBGD_URL    = https://github.com/libgd/libgd/releases/download/gd-$(LIBGD_VER)
 $(ARCHIVE)/$(LIBGD_SOURCE):
 	$(DOWNLOAD) $(LIBGD_URL)/$(LIBGD_SOURCE)
-LIBGD_DEPS   = $(D)/zlib $(D)/libpng $(D)/libjpeg $(D)/freetype
+LIBGD_DEPS   = zlib libpng libjpeg freetype
-$(D)/libgd2: $(LIBGD_DEPS) $(ARCHIVE)/$(LIBGD_SOURCE) | $(TARGET_DIR)
+libgd2: $(LIBGD_DEPS) $(ARCHIVE)/$(LIBGD_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBGD_TMP)
 	$(UNTAR)/$(LIBGD_SOURCE)
 	$(CHDIR)/$(LIBGD_TMP); \
@ -575,9 +575,9 @@ LIBDPF_URL    = https://bitbucket.org/max_10
 LIBDPF_PATCH  = libdpf-crossbuild.patch
-LIBDPF_DEPS   = $(D)/libusb-compat
+LIBDPF_DEPS   = libusb-compat
-$(D)/libdpf: $(LIBDPF_DEPS) | $(TARGET_DIR)
+libdpf: $(LIBDPF_DEPS) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBDPF_TMP)
 	$(GET-GIT-SOURCE) $(LIBDPF_URL)/$(LIBDPF_SOURCE) $(ARCHIVE)/$(LIBDPF_SOURCE)
 	$(CPDIR)/$(LIBDPF_SOURCE)
@ -602,7 +602,7 @@ LZO_URL    = https://www.oberhumer.com/opensource/lzo/download
 $(ARCHIVE)/$(LZO_SOURCE):
 	$(DOWNLOAD) $(LZO_URL)/$(LZO_SOURCE)
-$(D)/lzo: $(ARCHIVE)/$(LZO_SOURCE) | $(TARGET_DIR)
+lzo: $(ARCHIVE)/$(LZO_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LZO_TMP)
 	$(UNTAR)/$(LZO_SOURCE)
 	$(CHDIR)/$(LZO_TMP); \
@ -627,7 +627,7 @@ LIBSIGC_URL    = https://download.gnome.org/sources/libsigc++/$(basename $(LIBSI
 $(ARCHIVE)/$(LIBSIGC_SOURCE):
 	$(DOWNLOAD) $(LIBSIGC_URL)/$(LIBSIGC_SOURCE)
-$(D)/libsigc++: $(ARCHIVE)/$(LIBSIGC_SOURCE) | $(TARGET_DIR)
+libsigc++: $(ARCHIVE)/$(LIBSIGC_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBSIGC_TMP)
 	$(UNTAR)/$(LIBSIGC_SOURCE)
 	$(CHDIR)/$(LIBSIGC_TMP); \
@ -657,7 +657,7 @@ $(ARCHIVE)/$(EXPAT_SOURCE):
 EXPAT_PATCH  = expat-libtool-tag.patch
-$(D)/expat: $(ARCHIVE)/$(EXPAT_SOURCE) | $(TARGET_DIR)
+expat: $(ARCHIVE)/$(EXPAT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(EXPAT_TMP)
 	$(UNTAR)/$(EXPAT_SOURCE)
 	$(CHDIR)/$(EXPAT_TMP); \
@ -690,12 +690,12 @@ $(ARCHIVE)/$(LIBBLURAY_SOURCE):
 LIBBLURAY_PATCH  = libbluray.patch
-LIBBLURAY_DEPS   = $(D)/freetype
+LIBBLURAY_DEPS   = freetype
 ifeq ($(BOXSERIES), hd2)
-  LIBBLURAY_DEPS += $(D)/libaacs $(D)/libbdplus
+  LIBBLURAY_DEPS += libaacs libbdplus
 endif
-$(D)/libbluray: $(LIBBLURAY_DEPS) $(ARCHIVE)/$(LIBBLURAY_SOURCE) | $(TARGET_DIR)
+libbluray: $(LIBBLURAY_DEPS) $(ARCHIVE)/$(LIBBLURAY_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBBLURAY_TMP)
 	$(UNTAR)/$(LIBBLURAY_SOURCE)
 	$(CHDIR)/$(LIBBLURAY_TMP); \
@ -736,9 +736,9 @@ $(ARCHIVE)/$(LIBASS_SOURCE):
 LIBASS_PATCH  = libass.patch
-LIBASS_DEPS   = $(D)/freetype $(D)/fribidi
+LIBASS_DEPS   = freetype fribidi
-$(D)/libass: $(LIBASS_DEPS) $(ARCHIVE)/$(LIBASS_SOURCE) | $(TARGET_DIR)
+libass: $(LIBASS_DEPS) $(ARCHIVE)/$(LIBASS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBASS_TMP)
 	$(UNTAR)/$(LIBASS_SOURCE)
 	$(CHDIR)/$(LIBASS_TMP); \
@ -769,7 +769,7 @@ LIBGPG-ERROR_URL    = ftp://ftp.gnupg.org/gcrypt/libgpg-error
 $(ARCHIVE)/$(LIBGPG-ERROR_SOURCE):
 	$(DOWNLOAD) $(LIBGPG-ERROR_URL)/$(LIBGPG-ERROR_SOURCE)
-$(D)/libgpg-error: $(ARCHIVE)/$(LIBGPG-ERROR_SOURCE) | $(TARGET_DIR)
+libgpg-error: $(ARCHIVE)/$(LIBGPG-ERROR_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBGPG-ERROR_TMP)
 	$(UNTAR)/$(LIBGPG-ERROR_SOURCE)
 	$(CHDIR)/$(LIBGPG-ERROR_TMP); \
@ -803,9 +803,9 @@ LIBGCRYPT_URL    = ftp://ftp.gnupg.org/gcrypt/libgcrypt
 $(ARCHIVE)/$(LIBGCRYPT_SOURCE):
 	$(DOWNLOAD) $(LIBGCRYPT_URL)/$(LIBGCRYPT_SOURCE)
-LIBGCRYPT_DEPS   = $(D)/libgpg-error
+LIBGCRYPT_DEPS   = libgpg-error
-$(D)/libgcrypt: $(LIBGCRYPT_DEPS) $(ARCHIVE)/$(LIBGCRYPT_SOURCE) | $(TARGET_DIR)
+libgcrypt: $(LIBGCRYPT_DEPS) $(ARCHIVE)/$(LIBGCRYPT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBGCRYPT_TMP)
 	$(UNTAR)/$(LIBGCRYPT_SOURCE)
 	$(CHDIR)/$(LIBGCRYPT_TMP); \
@ -838,9 +838,9 @@ LIBAACS_URL    = ftp://ftp.videolan.org/pub/videolan/libaacs/$(LIBAACS_VER)
 $(ARCHIVE)/$(LIBAACS_SOURCE):
 	$(DOWNLOAD) $(LIBAACS_URL)/$(LIBAACS_SOURCE)
-LIBAACS_DEPS   = $(D)/libgcrypt
+LIBAACS_DEPS   = libgcrypt
-$(D)/libaacs: $(LIBAACS_DEPS) $(ARCHIVE)/$(LIBAACS_SOURCE) | $(TARGET_DIR)
+libaacs: $(LIBAACS_DEPS) $(ARCHIVE)/$(LIBAACS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBAACS_TMP)
 	$(UNTAR)/$(LIBAACS_SOURCE)
 	$(CHDIR)/$(LIBAACS_TMP); \
@ -872,9 +872,9 @@ LIBBDPLUS_URL    = ftp://ftp.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VER
 $(ARCHIVE)/$(LIBBDPLUS_SOURCE):
 	$(DOWNLOAD) $(LIBBDPLUS_URL)/$(LIBBDPLUS_SOURCE)
-LIBBDPLUS_DEPS   = $(D)/libaacs
+LIBBDPLUS_DEPS   = libaacs
-$(D)/libbdplus: $(LIBBDPLUS_DEPS) $(ARCHIVE)/$(LIBBDPLUS_SOURCE) | $(TARGET_DIR)
+libbdplus: $(LIBBDPLUS_DEPS) $(ARCHIVE)/$(LIBBDPLUS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBBDPLUS_TMP)
 	$(UNTAR)/$(LIBBDPLUS_SOURCE)
 	$(CHDIR)/$(LIBBDPLUS_TMP); \
@ -906,7 +906,7 @@ LIBXML2_URL    = http://xmlsoft.org/sources
 $(ARCHIVE)/$(LIBXML2_SOURCE):
 	$(DOWNLOAD) $(LIBXML2_URL)/$(LIBXML2_SOURCE)
-$(D)/libxml2: $(ARCHIVE)/$(LIBXML2_SOURCE) | $(TARGET_DIR)
+libxml2: $(ARCHIVE)/$(LIBXML2_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBXML2_TMP)
 	$(UNTAR)/$(LIBXML2_SOURCE)
 	$(CHDIR)/$(LIBXML2_TMP); \
@ -948,7 +948,7 @@ $(ARCHIVE)/$(PUGIXML_SOURCE):
 PUGIXML_PATCH  = pugixml-config.patch
-$(D)/pugixml: $(ARCHIVE)/$(PUGIXML_SOURCE) | $(TARGET_DIR)
+pugixml: $(ARCHIVE)/$(PUGIXML_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PUGIXML_TMP)
 	$(UNTAR)/$(PUGIXML_SOURCE)
 	$(CHDIR)/$(PUGIXML_TMP); \
@ -962,13 +962,13 @@ $(D)/pugixml: $(ARCHIVE)/$(PUGIXML_SOURCE) | $(TARGET_DIR)
 # -----------------------------------------------------------------------------
-RTMPDUMP_DEPS   = $(D)/zlib $(D)/openssl
+RTMPDUMP_DEPS   = zlib openssl
 RTMPDUMP_MAKE_OPTS = \
 	prefix= \
 	mandir=$(remove-mandir)
-$(D)/rtmpdump: $(RTMPDUMP_DEPS) $(SOURCE_DIR)/$(NI-RTMPDUMP) | $(TARGET_DIR)
+rtmpdump: $(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); \
@ -998,7 +998,7 @@ LIBTIRP_PATCH += 0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch
 LIBTIRP_PATCH += 0005-Disable-DES-authentification-support.patch
 LIBTIRP_PATCH += 0006-rpc-types.h-fix-musl-build.patch
-$(D)/libtirpc: $(ARCHIVE)/$(LIBTIRPC_SOURCE) | $(TARGET_DIR)
+libtirpc: $(ARCHIVE)/$(LIBTIRPC_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBTIRPC_TMP)
 	$(UNTAR)/$(LIBTIRPC_SOURCE)
 	$(CHDIR)/$(LIBTIRPC_TMP); \
@ -1028,7 +1028,7 @@ CONFUSE_URL    = https://github.com/martinh/libconfuse/releases/download/v$(CONF
 $(ARCHIVE)/$(CONFUSE_SOURCE):
 	$(DOWNLOAD) $(CONFUSE_URL)/$(CONFUSE_SOURCE)
-$(D)/confuse: $(ARCHIVE)/$(CONFUSE_SOURCE) | $(TARGET_DIR)
+confuse: $(ARCHIVE)/$(CONFUSE_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(CONFUSE_TMP)
 	$(UNTAR)/$(CONFUSE_SOURCE)
 	$(CHDIR)/$(CONFUSE_TMP); \
@ -1056,7 +1056,7 @@ LIBITE_URL    = https://github.com/troglobit/libite/releases/download/v$(LIBITE_
 $(ARCHIVE)/$(LIBITE_SOURCE):
 	$(DOWNLOAD) $(LIBITE_URL)/$(LIBITE_SOURCE)
-$(D)/libite: $(ARCHIVE)/$(LIBITE_SOURCE) | $(TARGET_DIR)
+libite: $(ARCHIVE)/$(LIBITE_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBITE_TMP)
 	$(UNTAR)/$(LIBITE_SOURCE)
 	$(CHDIR)/$(LIBITE_TMP); \
@ -1091,7 +1091,7 @@ LIBMAD_PATCH += libmad-remove-deprecated-cflags.patch
 LIBMAD_PATCH += libmad-thumb2-fixed-arm.patch
 LIBMAD_PATCH += libmad-thumb2-imdct-arm.patch
-$(D)/libmad: $(ARCHIVE)/$(LIBMAD_SOURCE) | $(TARGET_DIR)
+libmad: $(ARCHIVE)/$(LIBMAD_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBMAD_TMP)
 	$(UNTAR)/$(LIBMAD_SOURCE)
 	$(CHDIR)/$(LIBMAD_TMP); \
@ -1121,9 +1121,9 @@ LIBVORBISIDEC_URL    = https://ftp.de.debian.org/debian/pool/main/libv/libvorbis
 $(ARCHIVE)/$(LIBVORBISIDEC_SOURCE):
 	$(DOWNLOAD) $(LIBVORBISIDEC_URL)/$(LIBVORBISIDEC_SOURCE)
-LIBVORBISIDEC_DEPS   = $(D)/libogg
+LIBVORBISIDEC_DEPS   = libogg
-$(D)/libvorbisidec: $(LIBVORBISIDEC_DEPS) $(ARCHIVE)/$(LIBVORBISIDEC_SOURCE) | $(TARGET_DIR)
+libvorbisidec: $(LIBVORBISIDEC_DEPS) $(ARCHIVE)/$(LIBVORBISIDEC_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBVORBISIDEC_TMP)
 	$(UNTAR)/$(LIBVORBISIDEC_SOURCE)
 	$(CHDIR)/$(LIBVORBISIDEC_TMP); \
@ -1149,7 +1149,7 @@ LIBOGG_URL    = https://ftp.osuosl.org/pub/xiph/releases/ogg
 $(ARCHIVE)/$(LIBOGG_SOURCE):
 	$(DOWNLOAD) $(LIBOGG_URL)/$(LIBOGG_SOURCE)
-$(D)/libogg: $(ARCHIVE)/$(LIBOGG_SOURCE) | $(TARGET_DIR)
+libogg: $(ARCHIVE)/$(LIBOGG_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBOGG_TMP)
 	$(UNTAR)/$(LIBOGG_SOURCE)
 	$(CHDIR)/$(LIBOGG_TMP); \
@ -1175,7 +1175,7 @@ FRIBIDI_URL    = https://github.com/fribidi/fribidi/releases/download/v$(FRIBIDI
 $(ARCHIVE)/$(FRIBIDI_SOURCE):
 	$(DOWNLOAD) $(FRIBIDI_URL)/$(FRIBIDI_SOURCE)
-$(D)/fribidi: $(ARCHIVE)/$(FRIBIDI_SOURCE) | $(TARGET_DIR)
+fribidi: $(ARCHIVE)/$(FRIBIDI_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(FRIBIDI_TMP)
 	$(UNTAR)/$(FRIBIDI_SOURCE)
 	$(CHDIR)/$(FRIBIDI_TMP); \
@ -1208,7 +1208,7 @@ LIBFFI_PATCH  = libffi-install_headers.patch
 LIBFFI_CONF   = $(if $(filter $(BOXSERIES), hd1), --enable-static --disable-shared)
-$(D)/libffi: $(ARCHIVE)/$(LIBFFI_SOURCE) | $(TARGET_DIR)
+libffi: $(ARCHIVE)/$(LIBFFI_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBFFI_TMP)
 	$(UNTAR)/$(LIBFFI_SOURCE)
 	$(CHDIR)/$(LIBFFI_TMP); \
@ -1238,14 +1238,14 @@ $(ARCHIVE)/$(GLIB2_SOURCE):
 GLIB2_PATCH  = glib2-disable-tests.patch
 GLIB2_PATCH += glib2-automake.patch
-GLIB2_DEPS   = $(D)/zlib $(D)/libffi
+GLIB2_DEPS   = zlib libffi
 ifeq ($(BOXSERIES), hd2)
-  GLIB2_DEPS += $(D)/gettext
+  GLIB2_DEPS += gettext
 endif
 GLIB2_CONF   = $(if $(filter $(BOXSERIES), hd1), --enable-static --disable-shared)
-$(D)/glib2: $(GLIB2_DEPS) $(ARCHIVE)/$(GLIB2_SOURCE) | $(TARGET_DIR)
+glib2: $(GLIB2_DEPS) $(ARCHIVE)/$(GLIB2_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(GLIB2_TMP)
 	$(UNTAR)/$(GLIB2_SOURCE)
 	$(CHDIR)/$(GLIB2_TMP); \
@ -1304,7 +1304,7 @@ $(ARCHIVE)/$(ALSA-LIB_SOURCE):
 ALSA-LIB_PATCH  = alsa-lib.patch
 ALSA-LIB_PATCH += alsa-lib-link_fix.patch
-$(D)/alsa-lib: $(ARCHIVE)/$(ALSA-LIB_SOURCE)
+alsa-lib: $(ARCHIVE)/$(ALSA-LIB_SOURCE)
 	$(REMOVE)/$(ALSA-LIB_TMP)
 	$(UNTAR)/$(ALSA-LIB_SOURCE)
 	$(CHDIR)/$(ALSA-LIB_TMP); \
@ -1343,7 +1343,7 @@ POPT_URL    = ftp://anduin.linuxfromscratch.org/BLFS/popt
 $(ARCHIVE)/$(POPT_SOURCE):
 	$(DOWNLOAD) $(POPT_URL)/$(POPT_SOURCE)
-$(D)/popt: $(ARCHIVE)/$(POPT_SOURCE) | $(TARGET_DIR)
+popt: $(ARCHIVE)/$(POPT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(POPT_TMP)
 	$(UNTAR)/$(POPT_SOURCE)
 	$(CHDIR)/$(POPT_TMP); \
--- a/make/target-lua.mk
+++ b/make/target-lua.mk
@ -18,9 +18,9 @@ LUA_PATCH += lua-02-shared-libs-for-lua.patch
 LUA_PATCH += lua-03-lua-pc.patch
 LUA_PATCH += lua-04-crashfix.diff
-LUA_DEPS   = $(D)/ncurses
+LUA_DEPS   = ncurses
-$(D)/lua: $(LUA_DEPS) $(ARCHIVE)/$(LUA_SOURCE) | $(TARGET_DIR)
+lua: $(LUA_DEPS) $(ARCHIVE)/$(LUA_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LUA_TMP)
 	$(UNTAR)/$(LUA_SOURCE)
 	$(CHDIR)/$(LUA_TMP); \
@ -50,9 +50,9 @@ $(ARCHIVE)/$(LUAEXPAT_SOURCE):
 LUAEXPAT_PATCH  = luaexpat-makefile.patch
-LUAEXPAT_DEPS   = $(D)/expat $(D)/lua
+LUAEXPAT_DEPS   = expat lua
-$(D)/luaexpat: $(LUAEXPAT_DEPS) $(ARCHIVE)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR)
+luaexpat: $(LUAEXPAT_DEPS) $(ARCHIVE)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LUAEXPAT_TMP)
 	$(UNTAR)/$(LUAEXPAT_SOURCE)
 	$(CHDIR)/$(LUAEXPAT_TMP); \
@ -76,9 +76,9 @@ $(ARCHIVE)/$(LUA-FEEDPARSER_SOURCE):
 LUA-FEEDPARSER_PATCH  = lua-feedparser.patch
-LUA-DEEDPARSER_DEPS   = $(D)/luaexpat
+LUA-DEEDPARSER_DEPS   = luaexpat
-$(D)/lua-feedparser: $(LUA-DEEDPARSER_DEPS) $(ARCHIVE)/$(LUA-FEEDPARSER_SOURCE) | $(TARGET_DIR)
+lua-feedparser: $(LUA-DEEDPARSER_DEPS) $(ARCHIVE)/$(LUA-FEEDPARSER_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LUA-FEEDPARSER_TMP)
 	$(UNTAR)/$(LUA-FEEDPARSER_SOURCE)
 	$(CHDIR)/$(LUA-FEEDPARSER_TMP); \
@ -96,7 +96,7 @@ LUAJSON_URL    = http://regex.info/code
 $(ARCHIVE)/$(LUAJSON_SOURCE):
 	$(DOWNLOAD) $(LUAJSON_URL)/$(LUAJSON_SOURCE)
-$(D)/luajson: $(ARCHIVE)/$(LUAJSON_SOURCE) | $(TARGET_DIR)
+luajson: $(ARCHIVE)/$(LUAJSON_SOURCE) | $(TARGET_DIR)
 	$(CD) $(ARCHIVE); \
 		curl --remote-name --time-cond $(LUAJSON_SOURCE) $(LUAJSON_URL) || true
 	$(INSTALL_DATA) -D $(ARCHIVE)/$(LUAJSON_SOURCE) $(TARGET_SHARE_DIR)/lua/$(LUA_ABIVER)
@ -110,9 +110,9 @@ LUACURL_TMP    = lua-curlv3.$(LUACURL_VER)
 LUACURL_SOURCE = lua-curlv3.$(LUACURL_VER)
 LUACURL_URL    = https://github.com/lua-curl/$(LUACURL_SOURCE)
-LUACURL_DEPS   = $(D)/libcurl $(D)/lua
+LUACURL_DEPS   = libcurl lua
-$(D)/luacurl: $(LUACURL_DEPS) | $(TARGET_DIR)
+luacurl: $(LUACURL_DEPS) | $(TARGET_DIR)
 	$(REMOVE)/$(LUACURL_TMP)
 	$(GET-GIT-SOURCE) $(LUACURL_URL) $(ARCHIVE)/$(LUACURL_SOURCE)
 	$(CPDIR)/$(LUACURL_SOURCE)
@ -140,7 +140,7 @@ $(ARCHIVE)/$(LUAPOSIX_SOURCE):
 LUAPOSIX_PATCH  = luaposix-fix-build.patch
 LUAPOSIX_PATCH += luaposix-fix-docdir-build.patch
-LUAPOSIX_DEPS   = $(HOST_LUA) $(D)/lua $(D)/luaexpat
+LUAPOSIX_DEPS   = $(HOST_LUA) lua luaexpat
 GNULIB_VER    = 20140202
 GNULIB_SOURCE = gnulib-$(GNULIB_VER)-stable.tar.gz
@ -156,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: $(LUAPOSIX_DEPS) $(ARCHIVE)/$(SLINGSHOT_SOURCE) $(ARCHIVE)/$(GNULIB_SOURCE) $(ARCHIVE)/$(LUAPOSIX_SOURCE) | $(TARGET_DIR)
+luaposix: $(LUAPOSIX_DEPS) $(ARCHIVE)/$(SLINGSHOT_SOURCE) $(ARCHIVE)/$(GNULIB_SOURCE) $(ARCHIVE)/$(LUAPOSIX_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LUAPOSIX_TMP)
 	$(UNTAR)/$(LUAPOSIX_SOURCE)
 	$(CHDIR)/$(LUAPOSIX_TMP); \
--- a/make/target-tools-unused.mk
+++ b/make/target-tools-unused.mk
@ -15,9 +15,9 @@ $(ARCHIVE)/$(USBUTILS_SOURCE):
 USBUTILS_PATCH  = usbutils-avoid-dependency-on-bash.patch
 USBUTILS_PATCH += usbutils-fix-null-pointer-crash.patch
-USBUTILS_DEPS   = $(D)/libusb-compat
+USBUTILS_DEPS   = libusb-compat
-$(D)/usbutils: $(USBUTILS_DEPS) $(ARCHIVE)/$(USBUTILS_SOURCE) | $(TARGET_DIR)
+usbutils: $(USBUTILS_DEPS) $(ARCHIVE)/$(USBUTILS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(USBUTILS_TMP)
 	$(UNTAR)/$(USBUTILS_SOURCE)
 	$(CHDIR)/$(USBUTILS_TMP); \
@ -48,7 +48,7 @@ BINUTILS_URL    = https://ftp.gnu.org/gnu/binutils
 $(ARCHIVE)/$(BINUTILS_SOURCE):
 	$(DOWNLOAD) $(BINUTILS_URL)/$(BINUTILS_SOURCE)
-$(D)/binutils: $(ARCHIVE)/$(BINUTILS_SOURCE) | $(TARGET_DIR)
+binutils: $(ARCHIVE)/$(BINUTILS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(BINUTILS_TMP)
 	$(UNTAR)/$(BINUTILS_SOURCE)
 	$(CHDIR)/$(BINUTILS_TMP); \
@ -79,9 +79,9 @@ UTIL-LINUX_URL    = https://www.kernel.org/pub/linux/utils/util-linux/v$(UTIL-LI
 $(ARCHIVE)/$(UTIL-LINUX_SOURCE):
 	$(DOWNLOAD) $(UTIL-LINUX_URL)/$(UTIL-LINUX_SOURCE)
-UTUL-LINUX_DEPS   = $(D)/ncurses $(D)/zlib
+UTUL-LINUX_DEPS   = ncurses zlib
-$(D)/util-linux: $(UTUL-LINUX_DEPS) $(ARCHIVE)/$(UTIL-LINUX_SOURCE) | $(TARGET_DIR)
+util-linux: $(UTUL-LINUX_DEPS) $(ARCHIVE)/$(UTIL-LINUX_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(UTIL-LINUX_TMP)
 	$(UNTAR)/$(UTIL-LINUX_SOURCE)
 	$(CHDIR)/$(UTIL-LINUX_TMP); \
@ -129,11 +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
+ASTRA-SM_DEPS   = openssl
 # workaround unrecognized command line options
-$(D)/astra-sm: TARGET_ABI=""
+astra-sm: TARGET_ABI=""
-$(D)/astra-sm: $(ASTRA-SM_DEPS) | $(TARGET_DIR)
+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)
@ -157,7 +157,7 @@ IOZONE_URL    = http://www.iozone.org/src/current
 $(ARCHIVE)/$(IOZONE_SOURCE):
 	$(DOWNLOAD) $(IOZONE_URL)/$(IOZONE_SOURCE)
-$(D)/iozone3: $(ARCHIVE)/$(IOZONE_SOURCE) | $(TARGET_DIR)
+iozone3: $(ARCHIVE)/$(IOZONE_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(IOZONE_TMP)
 	$(UNTAR)/$(IOZONE_SOURCE)
 	$(CHDIR)/$(IOZONE_TMP)/src/current; \
@ -179,7 +179,7 @@ READLINE_URL    = https://ftp.gnu.org/gnu/readline
 $(ARCHIVE)/$(READLINE_SOURCE):
 	$(DOWNLOAD) $(READLINE_URL)/$(READLINE_SOURCE)
-$(D)/readline: $(ARCHIVE)/$(READLINE_SOURCE) | $(TARGET_DIR)
+readline: $(ARCHIVE)/$(READLINE_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(READLINE_TMP)
 	$(UNTAR)/$(READLINE_SOURCE)
 	$(CHDIR)/$(READLINE_TMP); \
--- a/make/target-tools.mk
+++ b/make/target-tools.mk
@ -17,7 +17,7 @@ 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
+BUSYBOX_DEPS   = libtirpc
 # Link busybox against libtirpc so that we can leverage its RPC support for NFS
 # mounting with BusyBox
@ -84,7 +84,7 @@ define BUSYBOX_MODIFY_CONFIG
 	$(BUSYBOX_SET_PKILL)
 endef
-$(D)/busybox: $(BUSYBOX_DEPS) $(ARCHIVE)/$(BUSYBOX_SOURCE) | $(TARGET_DIR)
+busybox: $(BUSYBOX_DEPS) $(ARCHIVE)/$(BUSYBOX_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(BUSYBOX_TMP)
 	$(UNTAR)/$(BUSYBOX_SOURCE)
 	$(CHDIR)/$(BUSYBOX_TMP); \
@ -107,9 +107,9 @@ OPENVPN_URL    = http://build.openvpn.net/downloads/releases
 $(ARCHIVE)/$(OPENVPN_SOURCE):
 	$(DOWNLOAD) $(OPENVPN_URL)/$(OPENVPN_SOURCE)
-OPENVPN_DEPS   = $(D)/lzo $(D)/openssl
+OPENVPN_DEPS   = lzo openssl
-$(D)/openvpn: $(OPENVPN_DEPS) $(ARCHIVE)/$(OPENVPN_SOURCE) | $(TARGET_DIR)
+openvpn: $(OPENVPN_DEPS) $(ARCHIVE)/$(OPENVPN_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(OPENVPN_TMP)
 	$(UNTAR)/$(OPENVPN_SOURCE)
 	$(CHDIR)/$(OPENVPN_TMP); \
@ -146,9 +146,9 @@ OPENSSH_URL    = https://artfiles.org/openbsd/OpenSSH/portable
 $(ARCHIVE)/$(OPENSSH_SOURCE):
 	$(DOWNLOAD) $(OPENSSH_URL)/$(OPENSSH_SOURCE)
-OPENSSH_DEPS   = $(D)/openssl $(D)/zlib
+OPENSSH_DEPS   = openssl zlib
-$(D)/openssh: $(OPENSSH_DEPS) $(ARCHIVE)/$(OPENSSH_SOURCE) | $(TARGET_DIR)
+openssh: $(OPENSSH_DEPS) $(ARCHIVE)/$(OPENSSH_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(OPENSSH_TMP)
 	$(UNTAR)/$(OPENSSH_SOURCE)
 	$(CHDIR)/$(OPENSSH_TMP); \
@ -196,7 +196,7 @@ TZDATA_ZONELIST = \
 ETC_LOCALTIME = $(if $(filter $(BOXSERIES), hd2),/var/etc/localtime,/etc/localtime)
-$(D)/tzdata: $(TZDATA_DEPS) $(ARCHIVE)/$(TZDATA_SOURCE) | $(TARGET_DIR)
+tzdata: $(TZDATA_DEPS) $(ARCHIVE)/$(TZDATA_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(TZDATA_TMP)
 	$(MKDIR)/$(TZDATA_TMP)
 	$(CHDIR)/$(TZDATA_TMP); \
@ -230,9 +230,9 @@ MTD-UTILS_URL    = ftp://ftp.infradead.org/pub/mtd-utils
 $(ARCHIVE)/$(MTD-UTILS_SOURCE):
 	$(DOWNLOAD) $(MTD-UTILS_URL)/$(MTD-UTILS_SOURCE)
-MTD-UTILS_DEPS   = $(D)/zlib $(D)/lzo $(D)/e2fsprogs
+MTD-UTILS_DEPS   = zlib lzo e2fsprogs
-$(D)/mtd-utils: $(MTD-UTILS_DEPS) $(ARCHIVE)/$(MTD-UTILS_SOURCE) | $(TARGET_DIR)
+mtd-utils: $(MTD-UTILS_DEPS) $(ARCHIVE)/$(MTD-UTILS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(MTD-UTILS_TMP)
 	$(UNTAR)/$(MTD-UTILS_SOURCE)
 	$(CHDIR)/$(MTD-UTILS_TMP); \
@ -268,7 +268,7 @@ $(ARCHIVE)/$(IPERF_SOURCE):
 IPERF_PATCH  = iperf-disable-profiling.patch
-$(D)/iperf: $(ARCHIVE)/$(IPERF_SOURCE) | $(TARGET_DIR)
+iperf: $(ARCHIVE)/$(IPERF_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(IPERF_TMP)
 	$(UNTAR)/$(IPERF_SOURCE)
 	$(CHDIR)/$(IPERF_TMP); \
@ -296,9 +296,9 @@ $(ARCHIVE)/$(PARTED_SOURCE):
 PARTED_PATCH  = parted-devmapper-1.patch
 PARTED_PATCH += parted-sysmacros.patch
-PARTED_DEPS   = $(D)/e2fsprogs
+PARTED_DEPS   = e2fsprogs
-$(D)/parted: $(PARTED_DEPS) $(ARCHIVE)/$(PARTED_SOURCE) | $(TARGET_DIR)
+parted: $(PARTED_DEPS) $(ARCHIVE)/$(PARTED_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PARTED_TMP)
 	$(UNTAR)/$(PARTED_SOURCE)
 	$(CHDIR)/$(PARTED_TMP); \
@ -335,7 +335,7 @@ HDPARM_URL    = https://sourceforge.net/projects/hdparm/files/hdparm
 $(ARCHIVE)/$(HDPARM_SOURCE):
 	$(DOWNLOAD) $(HDPARM_URL)/$(HDPARM_SOURCE)
-$(D)/hdparm: $(ARCHIVE)/$(HDPARM_SOURCE) | $(TARGET_DIR)
+hdparm: $(ARCHIVE)/$(HDPARM_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(HDPARM_TMP)
 	$(UNTAR)/$(HDPARM_SOURCE)
 	$(CHDIR)/$(HDPARM_TMP); \
@ -355,7 +355,7 @@ HD-IDLE_URL    = https://sourceforge.net/projects/hd-idle/files
 $(ARCHIVE)/$(HD-IDLE_SOURCE):
 	$(DOWNLOAD) $(HD-IDLE_URL)/$(HD-IDLE_SOURCE)
-$(D)/hd-idle: $(ARCHIVE)/$(HD-IDLE_SOURCE) | $(TARGET_DIR)
+hd-idle: $(ARCHIVE)/$(HD-IDLE_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(HD-IDLE_TMP)
 	$(UNTAR)/$(HD-IDLE_SOURCE)
 	$(CHDIR)/$(HD-IDLE_TMP); \
@ -379,7 +379,7 @@ COREUTILS_PATCH  = coreutils-fix-build.patch
 COREUTILS_BIN    = touch
-$(D)/coreutils: $(ARCHIVE)/$(COREUTILS_SOURCE) | $(TARGET_DIR)
+coreutils: $(ARCHIVE)/$(COREUTILS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(COREUTILS_TMP)
 	$(UNTAR)/$(COREUTILS_SOURCE)
 	$(CHDIR)/$(COREUTILS_TMP); \
@ -418,9 +418,9 @@ LESS_URL    = http://www.greenwoodsoftware.com/less
 $(ARCHIVE)/$(LESS_SOURCE):
 	$(DOWNLOAD) $(LESS_URL)/$(LESS_SOURCE)
-LESS_DEPS   = $(D)/ncurses
+LESS_DEPS   = ncurses
-$(D)/less: $(LESS_DEPS) $(ARCHIVE)/$(LESS_SOURCE) | $(TARGET_DIR)
+less: $(LESS_DEPS) $(ARCHIVE)/$(LESS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LESS_TMP)
 	$(UNTAR)/$(LESS_SOURCE)
 	$(CHDIR)/$(LESS_TMP); \
@ -446,9 +446,9 @@ $(ARCHIVE)/$(NTP_SOURCE):
 NTP_PATCH  = ntp.patch
-NTP_DEPS   = $(D)/openssl
+NTP_DEPS   = openssl
-$(D)/ntp: $(NTP_DEPS) $(ARCHIVE)/$(NTP_SOURCE) | $(TARGET_DIR)
+ntp: $(NTP_DEPS) $(ARCHIVE)/$(NTP_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(NTP_TMP)
 	$(UNTAR)/$(NTP_SOURCE)
 	$(CHDIR)/$(NTP_TMP); \
@ -486,9 +486,9 @@ DJMOUNT_PATCH += djmount-fixed-crash.patch
 DJMOUNT_PATCH += djmount-support-fstab-mounting.diff
 DJMOUNT_PATCH += djmount-support-seeking-in-large-2gb-files.patch
-DJMOUNT_DEPS   = $(D)/libfuse
+DJMOUNT_DEPS   = libfuse
-$(D)/djmount: $(DJMOUNT_DEPS) $(ARCHIVE)/$(DJMOUNT_SOURCE) | $(TARGET_DIR)
+djmount: $(DJMOUNT_DEPS) $(ARCHIVE)/$(DJMOUNT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(DJMOUNT_TMP)
 	$(UNTAR)/$(DJMOUNT_SOURCE)
 	$(CHDIR)/$(DJMOUNT_TMP); \
@ -520,9 +520,9 @@ $(ARCHIVE)/$(USHARE_SOURCE):
 USHARE_PATCH  = ushare.diff
 USHARE_PATCH += ushare-fix-building-with-gcc-5.x.patch
-USHARE_DEPS   = $(D)/libupnp
+USHARE_DEPS   = libupnp
-$(D)/ushare: $(USHARE_DEPS) $(ARCHIVE)/$(USHARE_SOURCE)| $(TARGET_DIR)
+ushare: $(USHARE_DEPS) $(ARCHIVE)/$(USHARE_SOURCE)| $(TARGET_DIR)
 	$(REMOVE)/$(USHARE_TMP)
 	$(UNTAR)/$(USHARE_SOURCE)
 	$(CHDIR)/$(USHARE_TMP); \
@ -558,7 +558,7 @@ SMARTMONTOOLS_URL    = https://sourceforge.net/projects/smartmontools/files/smar
 $(ARCHIVE)/$(SMARTMONTOOLS_SOURCE):
 	$(DOWNLOAD) $(SMARTMONTOOLS_URL)/$(SMARTMONTOOLS_SOURCE)
-$(D)/smartmontools: $(ARCHIVE)/$(SMARTMONTOOLS_SOURCE) | $(TARGET_DIR)
+smartmontools: $(ARCHIVE)/$(SMARTMONTOOLS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(SMARTMONTOOLS_TMP)
 	$(UNTAR)/$(SMARTMONTOOLS_SOURCE)
 	$(CHDIR)/$(SMARTMONTOOLS_TMP); \
@ -581,9 +581,9 @@ INADYN_URL    = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_
 $(ARCHIVE)/$(INADYN_SOURCE):
 	$(DOWNLOAD) $(INADYN_URL)/$(INADYN_SOURCE)
-INADYN_DEPS   = $(D)/openssl $(D)/confuse $(D)/libite
+INADYN_DEPS   = openssl confuse libite
-$(D)/inadyn: $(INADYN_DEPS) $(ARCHIVE)/$(INADYN_SOURCE) | $(TARGET_DIR)
+inadyn: $(INADYN_DEPS) $(ARCHIVE)/$(INADYN_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(INADYN_TMP)
 	$(UNTAR)/$(INADYN_SOURCE)
 	$(CHDIR)/$(INADYN_TMP); \
@ -621,9 +621,9 @@ VSFTPD_PATCH += vsftpd-disable-capabilities.patch
 VSFTPD_PATCH += vsftpd-fixchroot.patch
 VSFTPD_PATCH += vsftpd-login-blank-password.patch
-VSFTPD_DEPS   = $(D)/openssl
+VSFTPD_DEPS   = openssl
-$(D)/vsftpd: $(VSFTPD_DEPS) $(ARCHIVE)/$(VSFTPD_SOURCE) | $(TARGET_DIR)
+vsftpd: $(VSFTPD_DEPS) $(ARCHIVE)/$(VSFTPD_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(VSFTPD_TMP)
 	$(UNTAR)/$(VSFTPD_SOURCE)
 	$(CHDIR)/$(VSFTPD_TMP); \
@ -655,11 +655,11 @@ $(ARCHIVE)/$(PROCPS-NG_SOURCE):
 PROCPS-NG_PATCH  = procps-ng-0001-Fix-out-of-tree-builds.patch
 PROCPS-NG_PATCH += procps-ng-no-tests-docs.patch
-PROCPS-NG_DEPS   = $(D)/ncurses
+PROCPS-NG_DEPS   = ncurses
 PROCPS-NG_BIN    = ps top
-$(D)/procps-ng: $(PROCPS-NG_DEPS) $(ARCHIVE)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR)
+procps-ng: $(PROCPS-NG_DEPS) $(ARCHIVE)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PROCPS-NG_TMP)
 	$(UNTAR)/$(PROCPS-NG_SOURCE)
 	$(CHDIR)/$(PROCPS-NG_TMP); \
@ -698,9 +698,9 @@ NANO_URL    = https://www.nano-editor.org/dist/v$(basename $(NANO_VER))
 $(ARCHIVE)/$(NANO_SOURCE):
 	$(DOWNLOAD) $(NANO_URL)/$(NANO_SOURCE)
-NANO_DEPS   = $(D)/ncurses
+NANO_DEPS   = ncurses
-$(D)/nano: $(NANO_DEPS) $(ARCHIVE)/$(NANO_SOURCE) | $(TARGET_DIR)
+nano: $(NANO_DEPS) $(ARCHIVE)/$(NANO_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(NANO_TMP)
 	$(UNTAR)/$(NANO_SOURCE)
 	$(CHDIR)/$(NANO_TMP); \
@ -729,9 +729,9 @@ $(ARCHIVE)/$(MINICOM_SOURCE):
 MINICOM_PATCH  = minicom-fix-h-v-return-value-is-not-0.patch
-MINICOM_DEPS   = $(D)/ncurses
+MINICOM_DEPS   = ncurses
-$(D)/minicom: $(MINICOM_DEPS) $(ARCHIVE)/$(MINICOM_SOURCE) | $(TARGET_DIR)
+minicom: $(MINICOM_DEPS) $(ARCHIVE)/$(MINICOM_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(MINICOM_TMP)
 	$(UNTAR)/$(MINICOM_SOURCE)
 	$(CHDIR)/$(MINICOM_TMP); \
@ -758,7 +758,7 @@ $(ARCHIVE)/$(BASH_SOURCE):
 BASH_PATCH  = $(PATCHES)/bash
-$(D)/bash: $(ARCHIVE)/$(BASH_SOURCE) | $(TARGET_DIR)
+bash: $(ARCHIVE)/$(BASH_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(BASH_TMP)
 	$(UNTAR)/$(BASH_SOURCE)
 	$(CHDIR)/$(BASH_TMP); \
@ -787,7 +787,7 @@ E2FSPROGS_URL    = https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$
 $(ARCHIVE)/$(E2FSPROGS_SOURCE):
 	$(DOWNLOAD) $(E2FSPROGS_URL)/$(E2FSPROGS_SOURCE)
-$(D)/e2fsprogs: $(ARCHIVE)/$(E2FSPROGS_SOURCE) | $(TARGET_DIR)
+e2fsprogs: $(ARCHIVE)/$(E2FSPROGS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(E2FSPROGS_TMP)
 	$(UNTAR)/$(E2FSPROGS_SOURCE)
 	$(CHDIR)/$(E2FSPROGS_TMP); \
@ -839,7 +839,7 @@ NTFS-3G_URL    = https://tuxera.com/opensource
 $(ARCHIVE)/$(NTFS-3G_SOURCE):
 	$(DOWNLOAD) $(NTFS-3G_URL)/$(NTFS-3G_SOURCE)
-$(D)/ntfs-3g: $(ARCHIVE)/$(NTFS-3G_SOURCE) | $(TARGET_DIR)
+ntfs-3g: $(ARCHIVE)/$(NTFS-3G_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(NTFS-3G_TMP)
 	$(UNTAR)/$(NTFS-3G_SOURCE)
 	$(CHDIR)/$(NTFS-3G_TMP); \
@ -875,9 +875,9 @@ $(ARCHIVE)/$(AUTOFS_SOURCE):
 AUTOFS_PATCH  = $(addprefix autofs/, $(shell cat $(PATCHES)/autofs/patch_order_$(AUTOFS_VER)))
-AUTOFS_DEPS   = $(D)/libtirpc
+AUTOFS_DEPS   = libtirpc
-$(D)/autofs: $(AUTOFS_DEPS) $(ARCHIVE)/$(AUTOFS_SOURCE) | $(TARGET_DIR)
+autofs: $(AUTOFS_DEPS) $(ARCHIVE)/$(AUTOFS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(AUTOFS_TMP)
 	$(UNTAR)/$(AUTOFS_SOURCE)
 	$(CHDIR)/$(AUTOFS_TMP); \
@ -916,7 +916,7 @@ $(D)/autofs: $(AUTOFS_DEPS) $(ARCHIVE)/$(AUTOFS_SOURCE) | $(TARGET_DIR)
 SAMBA_TARGET = $(if $(filter $(BOXSERIES), hd1), samba33, samba36)
-$(D)/samba: $(SAMBA_TARGET)
+samba: $(SAMBA_TARGET)
 	$(TOUCH)
 # -----------------------------------------------------------------------------
@ -932,9 +932,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
-SAMBA33_DEPS   = $(D)/zlib
+SAMBA33_DEPS   = zlib
-$(D)/samba33: $(SAMBA33_DEPS) $(ARCHIVE)/$(SAMBA33_SOURCE) | $(TARGET_DIR)
+samba33: $(SAMBA33_DEPS) $(ARCHIVE)/$(SAMBA33_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(SAMBA33_TMP)
 	$(UNTAR)/$(SAMBA33_SOURCE)
 	$(CHDIR)/$(SAMBA33_TMP); \
@ -1015,9 +1015,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
-SAMBA36_DEPS   = $(D)/zlib
+SAMBA36_DEPS   = zlib
-$(D)/samba36: $(SAMBA36_DEPS) $(ARCHIVE)/$(SAMBA36_SOURCE) | $(TARGET_DIR)
+samba36: $(SAMBA36_DEPS) $(ARCHIVE)/$(SAMBA36_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(SAMBA36_TMP)
 	$(UNTAR)/$(SAMBA36_SOURCE)
 	$(CHDIR)/$(SAMBA36_TMP); \
@ -1085,9 +1085,9 @@ DROPBEAR_URL    = http://matt.ucc.asn.au/dropbear/releases
 $(ARCHIVE)/$(DROPBEAR_SOURCE):
 	$(DOWNLOAD) $(DROPBEAR_URL)/$(DROPBEAR_SOURCE)
-DROPBEAR_DEPS   = $(D)/zlib
+DROPBEAR_DEPS   = zlib
-$(D)/dropbear: $(DROPBEAR_DEPS) $(ARCHIVE)/$(DROPBEAR_SOURCE) | $(TARGET_DIR)
+dropbear: $(DROPBEAR_DEPS) $(ARCHIVE)/$(DROPBEAR_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(DROPBEAR_TMP)
 	$(UNTAR)/$(DROPBEAR_SOURCE)
 	$(CHDIR)/$(DROPBEAR_TMP); \
@ -1134,7 +1134,7 @@ $(ARCHIVE)/$(SG3_UTILS_SOURCE):
 SG3_UTILS_BIN    = sg_start
-$(D)/sg3_utils: $(ARCHIVE)/$(SG3_UTILS_SOURCE) | $(TARGET_DIR)
+sg3_utils: $(ARCHIVE)/$(SG3_UTILS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(SG3_UTILS_TMP)
 	$(UNTAR)/$(SG3_UTILS_SOURCE)
 	$(CHDIR)/$(SG3_UTILS_TMP); \
@ -1169,9 +1169,9 @@ $(ARCHIVE)/$(FBSHOT_SOURCE):
 FBSHOT_PATCH  = fbshot-32bit_cs_fb.diff
 FBSHOT_PATCH += fbshot_cs_hd2.diff
-FBSHOT_DEPS   = $(D)/libpng
+FBSHOT_DEPS   = libpng
-$(D)/fbshot: $(FBSHOT_DEPS) $(ARCHIVE)/$(FBSHOT_SOURCE) | $(TARGET_DIR)
+fbshot: $(FBSHOT_DEPS) $(ARCHIVE)/$(FBSHOT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(FBSHOT_TMP)
 	$(UNTAR)/$(FBSHOT_SOURCE)
 	$(CHDIR)/$(FBSHOT_TMP); \
@ -1190,9 +1190,9 @@ LCD4LINUX_TMP    = lcd4linux.$(LCD4LINUX_VER)
 LCD4LINUX_SOURCE = lcd4linux.$(LCD4LINUX_VER)
 LCD4LINUX_URL    = https://github.com/TangoCash
-LCD4LINUX_DEPS   = $(D)/ncurses $(D)/libgd2 $(D)/libdpf
+LCD4LINUX_DEPS   = ncurses libgd2 libdpf
-$(D)/lcd4linux: $(LCD4LINUX_DEPS) | $(TARGET_DIR)
+lcd4linux: $(LCD4LINUX_DEPS) | $(TARGET_DIR)
 	$(REMOVE)/$(LCD4LINUX_TMP)
 	$(GET-GIT-SOURCE) $(LCD4LINUX_URL)/$(LCD4LINUX_SOURCE) $(ARCHIVE)/$(LCD4LINUX_SOURCE)
 	$(CPDIR)/$(LCD4LINUX_SOURCE)
@ -1225,7 +1225,7 @@ SAMSUNGLCD4LINUX_TMP    = samsunglcd4linux.$(LCD4LINUX_VER)
 SAMSUNGLCD4LINUX_SOURCE = samsunglcd4linux.$(LCD4LINUX_VER)
 SAMSUNGLCD4LINUX_URL    = https://github.com/horsti58
-$(D)/samsunglcd4linux: | $(TARGET_DIR)
+samsunglcd4linux: | $(TARGET_DIR)
 	$(REMOVE)/$(SAMSUNGLCD4LINUX_TMP)
 	$(GET-GIT-SOURCE) $(SAMSUNGLCD4LINUX_URL)/$(SAMSUNGLCD4LINUX_SOURCE) $(ARCHIVE)/$(SAMSUNGLCD4LINUX_SOURCE)
 	$(CPDIR)/$(SAMSUNGLCD4LINUX_SOURCE)
@ -1245,9 +1245,9 @@ WPA_SUPPLICANT_URL    = https://w1.fi/releases
 $(ARCHIVE)/$(WPA_SUPPLICANT_SOURCE):
 	$(DOWNLOAD) $(WPA_SUPPLICANT_URL)/$(WPA_SUPPLICANT_SOURCE)
-WPA_SUPPLICANT_DEPS   = $(D)/openssl
+WPA_SUPPLICANT_DEPS   = openssl
-$(D)/wpa_supplicant: $(WPA_SUPPLICANT_DEPS) $(ARCHIVE)/$(WPA_SUPPLICANT_SOURCE) | $(TARGET_DIR)
+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; \
@ -1273,9 +1273,9 @@ XUPNPD_PATCH += xupnpd-fix-webif-backlinks.diff
 XUPNPD_PATCH += xupnpd-change-XUPNPDROOTDIR.diff
 XUPNPD_PATCH += xupnpd-add-configuration-files.diff
-XUPNPD_DEPS   = $(D)/lua $(D)/openssl
+XUPNPD_DEPS   = lua openssl
-$(D)/xupnpd: $(XUPNPD_DEPS) | $(TARGET_DIR)
+xupnpd: $(XUPNPD_DEPS) | $(TARGET_DIR)
 	$(REMOVE)/$(XUPNPD_TMP)
 	$(GET-GIT-SOURCE) $(XUPNPD_URL)/$(XUPNPD_SOURCE) $(ARCHIVE)/$(XUPNPD_SOURCE)
 	$(CPDIR)/$(XUPNPD_SOURCE)
@ -1311,7 +1311,7 @@ $(ARCHIVE)/$(DOSFSTOOLS_SOURCE):
 DOSFSTOOLS_CFLAGS = $(TARGET_CFLAGS) -D_GNU_SOURCE -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
-$(D)/dosfstools: $(ARCHIVE)/$(DOSFSTOOLS_SOURCE) | $(TARGET_DIR)
+dosfstools: $(ARCHIVE)/$(DOSFSTOOLS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(DOSFSTOOLS_TMP)
 	$(UNTAR)/$(DOSFSTOOLS_SOURCE)
 	$(CHDIR)/$(DOSFSTOOLS_TMP); \
@ -1345,11 +1345,11 @@ 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_DEPS   = rpcbind
 NFS-UTILS_CONF   = $(if $(filter $(BOXSERIES), hd1), --disable-ipv6, --enable-ipv6)
-$(D)/nfs-utils: $(NFS-UTILS_DEPS) $(ARCHIVE)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR)
+nfs-utils: $(NFS-UTILS_DEPS) $(ARCHIVE)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(NFS-UTILS_TMP)
 	$(UNTAR)/$(NFS-UTILS_SOURCE)
 	$(CHDIR)/$(NFS-UTILS_TMP); \
@ -1402,9 +1402,9 @@ $(ARCHIVE)/$(RPCBIND_SOURCE):
 RPCBIND_PATCH  = rpcbind-0001-Remove-yellow-pages-support.patch
 RPCBIND_PATCH += rpcbind-0002-add_option_to_fix_port_number.patch
-RPCBIND_DEPS   = $(D)/libtirpc
+RPCBIND_DEPS   = libtirpc
-$(D)/rpcbind: $(RPCBIND_DEPS) $(ARCHIVE)/$(RPCBIND_SOURCE) | $(TARGET_DIR)
+rpcbind: $(RPCBIND_DEPS) $(ARCHIVE)/$(RPCBIND_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(RPCBIND_TMP)
 	$(UNTAR)/$(RPCBIND_SOURCE)
 	$(CHDIR)/$(RPCBIND_TMP); \
@ -1437,9 +1437,9 @@ FUSE-EXFAT_URL    = https://github.com/relan/exfat/releases/download/v$(FUSE-EXF
 $(ARCHIVE)/$(FUSE-EXFAT_SOURCE):
 	$(DOWNLOAD) $(FUSE-EXFAT_URL)/$(FUSE-EXFAT_SOURCE)
-FUSE-EXFAT_DEPS   = $(D)/libfuse
+FUSE-EXFAT_DEPS   = libfuse
-$(D)/fuse-exfat: $(FUSE-EXFAT_DEPS) $(ARCHIVE)/$(FUSE-EXFAT_SOURCE) | $(TARGET_DIR)
+fuse-exfat: $(FUSE-EXFAT_DEPS) $(ARCHIVE)/$(FUSE-EXFAT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(FUSE-EXFAT_TMP)
 	$(UNTAR)/$(FUSE-EXFAT_SOURCE)
 	$(CHDIR)/$(FUSE-EXFAT_TMP); \
@ -1464,9 +1464,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)
-EXFAT-UTILS_DEPS   = $(D)/fuse-exfat
+EXFAT-UTILS_DEPS   = fuse-exfat
-$(D)/exfat-utils: $(EXFAT-UTILS_DEPS) $(ARCHIVE)/$(EXFAT-UTILS_SOURCE) | $(TARGET_DIR)
+exfat-utils: $(EXFAT-UTILS_DEPS) $(ARCHIVE)/$(EXFAT-UTILS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(EXFAT-UTILS_TMP)
 	$(UNTAR)/$(EXFAT-UTILS_SOURCE)
 	$(CHDIR)/$(EXFAT-UTILS_TMP); \
@ -1483,9 +1483,9 @@ $(D)/exfat-utils: $(EXFAT-UTILS_DEPS) $(ARCHIVE)/$(EXFAT-UTILS_SOURCE) | $(TARGE
 # -----------------------------------------------------------------------------
-STREAMRIPPER_DEPS   = $(D)/libvorbisidec $(D)/libmad $(D)/glib2
+STREAMRIPPER_DEPS   = libvorbisidec libmad glib2
-$(D)/streamripper: $(STREAMRIPPER_DEPS) | $(TARGET_DIR)
+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); \
@ -1513,7 +1513,7 @@ GETTEXT_URL    = ftp://ftp.gnu.org/gnu/gettext
 $(ARCHIVE)/$(GETTEXT_SOURCE):
 	$(DOWNLOAD) $(GETTEXT_URL)/$(GETTEXT_SOURCE)
-$(D)/gettext: $(ARCHIVE)/$(GETTEXT_SOURCE) | $(TARGET_DIR)
+gettext: $(ARCHIVE)/$(GETTEXT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(GETTEXT_TMP)
 	$(UNTAR)/$(GETTEXT_SOURCE)
 	$(CHDIR)/$(GETTEXT_TMP)/gettext-runtime; \
@ -1547,9 +1547,9 @@ MC_URL    = ftp.midnight-commander.org
 $(ARCHIVE)/$(MC_SOURCE):
 	$(DOWNLOAD) $(MC_URL)/$(MC_SOURCE)
-MC_DEPS   = $(D)/glib2 $(D)/ncurses
+MC_DEPS   = glib2 ncurses
-$(D)/mc: $(MC_DEPS) $(ARCHIVE)/$(MC_SOURCE) | $(TARGET_DIR)
+mc: $(MC_DEPS) $(ARCHIVE)/$(MC_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(MC_TMP)
 	$(UNTAR)/$(MC_SOURCE)
 	$(CHDIR)/$(MC_TMP); \
@ -1591,11 +1591,11 @@ $(ARCHIVE)/$(WGET_SOURCE):
 WGET_PATCH  = set-check_cert-false-by-default.patch
 WGET_PATCH += change_DEFAULT_LOGFILE.patch
-WGET_DEPS   = $(D)/openssl
+WGET_DEPS   = openssl
 WGET_CFLAGS = $(TARGET_CFLAGS) -DOPENSSL_NO_ENGINE
-$(D)/wget: $(WGET_DEPS) $(ARCHIVE)/$(WGET_SOURCE) | $(TARGET_DIR)
+wget: $(WGET_DEPS) $(ARCHIVE)/$(WGET_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(WGET_TMP)
 	$(UNTAR)/$(WGET_SOURCE)
 	$(CHDIR)/$(WGET_TMP); \
@ -1629,7 +1629,7 @@ LIBICONV_PATCH  = iconv-disable_transliterations.patch
 LIBICONV_PATCH += iconv-strip_charsets.patch
 # builds only stripped down iconv binary used for smarthomeinfo plugin
-$(D)/iconv: $(ARCHIVE)/$(LIBICONV_SOURCE) | $(TARGET_DIR)
+iconv: $(ARCHIVE)/$(LIBICONV_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBICONV_TMP)
 	$(UNTAR)/$(LIBICONV_SOURCE)
 	$(CHDIR)/$(LIBICONV_TMP); \
@ -1651,7 +1651,7 @@ $(D)/iconv: $(ARCHIVE)/$(LIBICONV_SOURCE) | $(TARGET_DIR)
 # -----------------------------------------------------------------------------
-$(D)/ofgwrite: $(SOURCE_DIR)/$(NI-OFGWRITE) | $(TARGET_DIR)
+ofgwrite: $(SOURCE_DIR)/$(NI-OFGWRITE) | $(TARGET_DIR)
 	$(REMOVE)/$(NI-OFGWRITE)
 	tar -C $(SOURCE_DIR) -cp $(NI-OFGWRITE) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	$(CHDIR)/$(NI-OFGWRITE); \
@ -1670,9 +1670,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
-AIO-GRAB_DEPS   = $(D)/zlib $(D)/libpng $(D)/libjpeg
+AIO-GRAB_DEPS   = zlib libpng libjpeg
-$(D)/aio-grab: $(AIO-GRAB_DEPS) | $(TARGET_DIR)
+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)
@ -1698,7 +1698,7 @@ DVBSNOOP_TMP    = dvbsnoop.$(DVBSNOOP_VER)
 DVBSNOOP_SOURCE = dvbsnoop.$(DVBSNOOP_VER)
 DVBSNOOP_URL    = https://github.com/Duckbox-Developers
-$(D)/dvbsnoop: | $(TARGET_DIR)
+dvbsnoop: | $(TARGET_DIR)
 	$(REMOVE)/$(DVBSNOOP_TMP)
 	$(GET-GIT-SOURCE) $(DVBSNOOP_URL)/$(DVBSNOOP_SOURCE) $(ARCHIVE)/$(DVBSNOOP_SOURCE)
 	$(CPDIR)/$(DVBSNOOP_SOURCE)
@ -1723,7 +1723,7 @@ ETHTOOL_URL    = https://www.kernel.org/pub/software/network/ethtool
 $(ARCHIVE)/$(ETHTOOL_SOURCE):
 	$(DOWNLOAD) $(ETHTOOL_URL)/$(ETHTOOL_SOURCE)
-$(D)/ethtool: $(ARCHIVE)/$(ETHTOOL_SOURCE) | $(TARGET_DIR)
+ethtool: $(ARCHIVE)/$(ETHTOOL_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(ETHTOOL_TMP)
 	$(UNTAR)/$(ETHTOOL_SOURCE)
 	$(CHDIR)/$(ETHTOOL_TMP); \
@ -1750,9 +1750,9 @@ $(ARCHIVE)/$(GPTFDISK_SOURCE):
 GPTFDISK_PATCH  = gptfdisk-ldlibs.patch
-GPTFDISK_DEPS   = $(D)/popt $(D)/e2fsprogs
+GPTFDISK_DEPS   = popt e2fsprogs
-$(D)/gptfdisk: $(GPTFDISK_DEPS) $(ARCHIVE)/$(GPTFDISK_SOURCE) | $(TARGET_DIR)
+gptfdisk: $(GPTFDISK_DEPS) $(ARCHIVE)/$(GPTFDISK_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(GPTFDISK_TMP)
 	$(UNTAR)/$(GPTFDISK_SOURCE)
 	$(CHDIR)/$(GPTFDISK_TMP); \
@ -1775,9 +1775,9 @@ RSYNC_URL    = https://ftp.samba.org/pub/rsync
 $(ARCHIVE)/$(RSYNC_SOURCE):
 	$(DOWNLOAD) $(RSYNC_URL)/$(RSYNC_SOURCE)
-RSYNC_DEPS   = $(D)/zlib $(D)/popt
+RSYNC_DEPS   = zlib popt
-$(D)/rsync: $(RSYNC_DEPS) $(ARCHIVE)/$(RSYNC_SOURCE) | $(TARGET_DIR)
+rsync: $(RSYNC_DEPS) $(ARCHIVE)/$(RSYNC_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(RSYNC_TMP)
 	$(UNTAR)/$(RSYNC_SOURCE)
 	$(CHDIR)/$(RSYNC_TMP); \
@ -1803,7 +1803,7 @@ CA-BUNDLE_URL    = https://curl.haxx.se/ca
 $(ARCHIVE)/$(CA-BUNDLE_SOURCE):
 	$(DOWNLOAD) $(CA-BUNDLE_URL)/$(CA-BUNDLE_SOURCE)
-$(D)/ca-bundle: $(ARCHIVE)/$(CA-BUNDLE_SOURCE) | $(TARGET_DIR)
+ca-bundle: $(ARCHIVE)/$(CA-BUNDLE_SOURCE) | $(TARGET_DIR)
 	$(CD) $(ARCHIVE); \
 		curl --remote-name --time-cond $(CA-BUNDLE_SOURCE) $(CA-BUNDLE_URL)/$(CA-BUNDLE_SOURCE) || true
 	$(INSTALL_DATA) -D $(ARCHIVE)/$(CA-BUNDLE_SOURCE) $(TARGET_DIR)/$(CA-BUNDLE_DIR)/$(CA-BUNDLE)