- rework makefiles: fix indentation; ...

- introduce $(CHDIR) variable - introduce $(TOUCH) variable
7 years ago · 08586a9e4d
19 changed files with 1157 additions and 760 deletions
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@ -111,8 +111,9 @@ pkg-config-preqs:

 pkg-config: $(HOST_DIR)/bin/pkg-config
 $(HOST_DIR)/bin/pkg-config: $(ARCHIVE)/pkg-config-$(PKGCONF_VER).tar.gz | $(HOST_DIR)/bin pkg-config-preqs
+	$(REMOVE)/pkg-config-$(PKGCONF_VER)
 	$(UNTAR)/pkg-config-$(PKGCONF_VER).tar.gz
-	set -e; cd $(BUILD_TMP)/pkg-config-$(PKGCONF_VER); \
+	$(CHDIR)/pkg-config-$(PKGCONF_VER); \
 		./configure \
 			--with-pc_path=$(PKG_CONFIG_PATH); \
 		$(MAKE); \
@ -126,8 +127,9 @@ mkfs.jffs2: $(HOST_DIR)/bin/mkfs.jffs2
 sumtool: $(HOST_DIR)/bin/sumtool
 $(HOST_DIR)/bin/mkfs.jffs2 \
 $(HOST_DIR)/bin/sumtool: $(ARCHIVE)/mtd-utils-$(MTD-UTILS_VER).tar.bz2 | $(HOST_DIR)/bin
+	$(REMOVE)/mtd-utils-$(MTD-UTILS_VER)
 	$(UNTAR)/mtd-utils-$(MTD-UTILS_VER).tar.bz2
-	pushd $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER) && \
+	$(CHDIR)/mtd-utils-$(MTD-UTILS_VER) && \
 		./configure \
 			ZLIB_CFLAGS=" " \
 			ZLIB_LIBS="-lz" \
@ -144,8 +146,9 @@ $(HOST_DIR)/bin/sumtool: $(ARCHIVE)/mtd-utils-$(MTD-UTILS_VER).tar.bz2 | $(HOST_

 mkimage: $(HOST_DIR)/bin/mkimage
 $(HOST_DIR)/bin/mkimage: $(ARCHIVE)/u-boot-$(U_BOOT_VER).tar.bz2 | $(HOST_DIR)/bin
+	$(REMOVE)/u-boot-$(U_BOOT_VER)
 	$(UNTAR)/u-boot-$(U_BOOT_VER).tar.bz2
-	pushd $(BUILD_TMP)/u-boot-$(U_BOOT_VER) && \
+	$(CHDIR)/u-boot-$(U_BOOT_VER) && \
 		$(MAKE) defconfig && \
 		$(MAKE) silentoldconfig && \
 		$(MAKE) tools-only
@ -154,18 +157,20 @@ $(HOST_DIR)/bin/mkimage: $(ARCHIVE)/u-boot-$(U_BOOT_VER).tar.bz2 | $(HOST_DIR)/b

 zic: $(HOST_DIR)/bin/zic
 $(HOST_DIR)/bin/zic: $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz $(ARCHIVE)/tzcode$(TZCODE_VER).tar.gz | $(HOST_DIR)/bin
+	$(REMOVE)/tzcode
 	mkdir $(BUILD_TMP)/tzcode && \
 	tar -C $(BUILD_TMP)/tzcode -xf $(ARCHIVE)/tzcode$(TZCODE_VER).tar.gz
 	tar -C $(BUILD_TMP)/tzcode -xf $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz
-	pushd $(BUILD_TMP)/tzcode && \
+	$(CHDIR)/tzcode && \
 		$(MAKE) zic
 	install -D -m 0755 $(BUILD_TMP)/tzcode/zic $(HOST_DIR)/bin/
 	$(REMOVE)/tzcode

 parted_host: $(HOST_DIR)/bin/parted
 $(HOST_DIR)/bin/parted: $(ARCHIVE)/parted-$(PARTED_VER).tar.xz | $(HOST_DIR)/bin
+	$(REMOVE)/parted-$(PARTED_VER)
 	$(UNTAR)/parted-$(PARTED_VER).tar.xz
-	cd $(BUILD_TMP)/parted-$(PARTED_VER) && \
+	$(CHDIR)/parted-$(PARTED_VER) && \
 		$(PATCH)/parted-3.2-devmapper-1.patch && \
 		$(PATCH)/parted-3.2-sysmacros.patch && \
 		./configure \
@ -180,8 +185,9 @@ $(HOST_DIR)/bin/parted: $(ARCHIVE)/parted-$(PARTED_VER).tar.xz | $(HOST_DIR)/bin

 mkfs.fat: $(HOST_DIR)/bin/mkfs.fat
 $(HOST_DIR)/bin/mkfs.fat: $(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.xz | $(HOST_DIR)/bin
+	$(REMOVE)/dosfstools-$(DOSFSTOOLS_VER)
 	$(UNTAR)/dosfstools-$(DOSFSTOOLS_VER).tar.xz
-	set -e; cd $(BUILD_TMP)/dosfstools-$(DOSFSTOOLS_VER); \
+	$(CHDIR)/dosfstools-$(DOSFSTOOLS_VER); \
 		./configure \
 			--without-udev \
 		; \
@ -194,8 +200,9 @@ $(HOST_DIR)/bin/mkfs.fat: $(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.xz | $(HOS

 mtools: $(HOST_DIR)/bin/mtools
 $(HOST_DIR)/bin/mtools: $(ARCHIVE)/mtools-$(MTOOLS_VER).tar.gz | $(HOST_DIR)/bin
+	$(REMOVE)/mtools-$(MTOOLS_VER)
 	$(UNTAR)/mtools-$(MTOOLS_VER).tar.gz
-	set -e; cd $(BUILD_TMP)/mtools-$(MTOOLS_VER); \
+	$(CHDIR)/mtools-$(MTOOLS_VER); \
 		./configure; \
 		$(MAKE)
 	install -D -m 0755 $(BUILD_TMP)/mtools-$(MTOOLS_VER)/mtools $(HOST_DIR)/bin/
@ -204,8 +211,9 @@ $(HOST_DIR)/bin/mtools: $(ARCHIVE)/mtools-$(MTOOLS_VER).tar.gz | $(HOST_DIR)/bin

 resize2fs: $(HOST_DIR)/bin/resize2fs
 $(HOST_DIR)/bin/resize2fs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(HOST_DIR)/bin
+	$(REMOVE)/e2fsprogs-$(E2FSPROGS_VER)
 	$(UNTAR)/e2fsprogs-$(E2FSPROGS_VER).tar.gz
-	cd $(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER) && \
+	$(CHDIR)/e2fsprogs-$(E2FSPROGS_VER) && \
 		./configure; \
 		$(MAKE)
 	install -D -m 0755 $(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER)/resize/resize2fs $(HOST_DIR)/bin/
--- a/make/crosstool.mk
+++ b/make/crosstool.mk
@ -27,12 +27,10 @@ crosstools-renew:
 crosstool-arm-hd1: CROSS_DIR-check $(SOURCE_DIR)/$(NI_LINUX-KERNEL)
 	make $(BUILD_TMP)
 	$(REMOVE)/crosstool-ng
-	cd $(BUILD_TMP) && \
-	git clone https://github.com/crosstool-ng/crosstool-ng && \
-	cd crosstool-ng && \
-	git checkout 1dbb06f2 && \
-	unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \
-	cd $(BUILD_TMP)/crosstool-ng && \
+	git clone https://github.com/crosstool-ng/crosstool-ng $(BUILD_TMP)/crosstool-ng && \
+	$(CHDIR)/crosstool-ng && \
+		git checkout 1dbb06f2 && \
+		unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \
 		mkdir -p $(BUILD_TMP)/crosstool-ng/targets/src/ && \
 			pushd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \
 				git checkout $(KERNEL_BRANCH) && \
@ -59,13 +57,11 @@ UCLIBC_VER=1.0.24
 crosstool-arm-hd2: CROSS_DIR-check $(ARCHIVE)/gcc-linaro-$(GCC_VER).tar.xz $(SOURCE_DIR)/$(NI_LINUX-KERNEL)
 	make $(BUILD_TMP)
 	$(REMOVE)/crosstool-ng
-	cd $(BUILD_TMP) && \
-	git clone https://github.com/crosstool-ng/crosstool-ng && \
-	cd crosstool-ng && \
-	git checkout 1dbb06f2 && \
-	cp -a $(PATCHES)/crosstool-ng/gcc/* $(BUILD_TMP)/crosstool-ng/patches/gcc/linaro-6.3-2017.02 && \
-	unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \
-	cd $(BUILD_TMP)/crosstool-ng && \
+	git clone https://github.com/crosstool-ng/crosstool-ng $(BUILD_TMP)/crosstool-ng && \
+	$(CHDIR)/crosstool-ng && \
+		git checkout 1dbb06f2 && \
+		cp -a $(PATCHES)/crosstool-ng/gcc/* $(BUILD_TMP)/crosstool-ng/patches/gcc/linaro-6.3-2017.02 && \
+		unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \
 		mkdir -p $(BUILD_TMP)/crosstool-ng/targets/src/ && \
 			pushd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \
 				git checkout $(KERNEL_BRANCH) && \
@ -92,13 +88,11 @@ crosstool-arm-hd2: CROSS_DIR-check $(ARCHIVE)/gcc-linaro-$(GCC_VER).tar.xz $(SOU
 crosstool-arm-hd51: CROSS_DIR-check
 	make $(BUILD_TMP)
 	$(REMOVE)/crosstool-ng
-	cd $(BUILD_TMP) && \
-	git clone https://github.com/crosstool-ng/crosstool-ng && \
-	cd crosstool-ng && \
-	git checkout 1dbb06f2 && \
-	cp -a $(PATCHES)/crosstool-ng/gcc/* $(BUILD_TMP)/crosstool-ng/patches/gcc/linaro-6.3-2017.02 && \
-	unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \
-	cd $(BUILD_TMP)/crosstool-ng && \
+	git clone https://github.com/crosstool-ng/crosstool-ng $(BUILD_TMP)/crosstool-ng && \
+	$(CHDIR)/crosstool-ng && \
+		git checkout 1dbb06f2 && \
+		cp -a $(PATCHES)/crosstool-ng/gcc/* $(BUILD_TMP)/crosstool-ng/patches/gcc/linaro-6.3-2017.02 && \
+		unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \
 		mkdir -p $(BUILD_TMP)/crosstool-ng/targets/src/ && \
 			pushd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \
 				git checkout $(KERNEL_BRANCH) && \
--- a/make/devel-tools.mk
+++ b/make/devel-tools.mk
@ -1,20 +1,26 @@
 #Makefile to build devel-tools

+# -----------------------------------------------------------------------------
+
 valgrind: valgrind-$(BOXSERIES)

+# -----------------------------------------------------------------------------
+
 $(D)/valgrind-hd51 \
 $(D)/valgrind-hd2: $(ARCHIVE)/valgrind-$(VALGRIND_VER).tar.bz2 | $(TARGET_DIR)
+	$(REMOVE)/valgrind-$(VALGRIND_VER)
 	$(UNTAR)/valgrind-$(VALGRIND_VER).tar.bz2
-	cd $(BUILD_TMP)/valgrind-$(VALGRIND_VER) && \
-	$(PATCH)/valgrind-fix-$(BOXSERIES)-build.patch && \
-		export AR=$(TARGET)-ar && \
-		autoreconf -fi && \
+	$(CHDIR)/valgrind-$(VALGRIND_VER); \
+		$(PATCH)/valgrind-fix-$(BOXSERIES)-build.patch; \
+		export AR=$(TARGET)-ar; \
+		autoreconf -fi; \
 		$(CONFIGURE) \
 			--prefix= \
 			--enable-only32bit \
 			--mandir=/.remove \
-			--datadir=/.remove && \
-		$(MAKE) all && \
+			--datadir=/.remove \
+			; \
+		$(MAKE) all; \
 		make install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/valgrind.pc
 	rm $(TARGET_DIR)/bin/callgrind_annotate
@ -23,44 +29,54 @@ $(D)/valgrind-hd2: $(ARCHIVE)/valgrind-$(VALGRIND_VER).tar.bz2 | $(TARGET_DIR)
 	rm $(TARGET_DIR)/bin/cg_diff
 	rm $(TARGET_DIR)/bin/ms_print
 	$(REMOVE)/valgrind-$(VALGRIND_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 $(D)/valgrind-hd1:
-	svn co -r 12305 svn://svn.valgrind.org/valgrind/trunk $(BUILD_TMP)/valgrind && \
-	pushd $(BUILD_TMP)/valgrind && \
-	svn up --force -r {2011-12-13} VEX && \
-	$(PATCH)/valgrind12305-nevis-patch.diff && \
-	$(PATCH)/valgrind-automake-1.11.2.patch && \
-		autoreconf -fi && \
+	$(REMOVE)/valgrind
+	svn co -r 12305 svn://svn.valgrind.org/valgrind/trunk $(BUILD_TMP)/valgrind; \
+	$(CHDIR)/valgrind; \
+		svn up --force -r {2011-12-13} VEX; \
+		$(PATCH)/valgrind12305-nevis-patch.diff; \
+		$(PATCH)/valgrind-automake-1.11.2.patch; \
+		autoreconf -fi; \
 		$(CONFIGURE) \
 			--prefix= \
 			--enable-only32bit \
 			--mandir=/.remove \
-			--datadir=/.remove && \
-		$(MAKE) all && \
+			--datadir=/.remove \
+			; \
+		$(MAKE) all; \
 		make install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/valgrind.pc
 	$(REMOVE)/valgrind
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 $(D)/strace: $(ARCHIVE)/strace-$(STRACE_VER).tar.xz | $(TARGET_DIR)
+	$(REMOVE)/strace-$(STRACE_VER)
 	$(UNTAR)/strace-$(STRACE_VER).tar.xz
-	cd $(BUILD_TMP)/strace-$(STRACE_VER) && \
+	$(CHDIR)/strace-$(STRACE_VER); \
 		$(CONFIGURE) \
 			--prefix= \
 			--mandir=$(BUILD_TMP)/.remove \
-			--enable-silent-rules && \
-		$(MAKE) all && \
+			--enable-silent-rules \
+			; \
+		$(MAKE) all; \
 		make install prefix=$(TARGET_DIR)
 	rm $(TARGET_DIR)/bin/strace-graph
 	rm $(TARGET_DIR)/bin/strace-log-merge
 	$(REMOVE)/strace-$(STRACE_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 $(D)/gdb: $(D)/zlib $(D)/libncurses $(ARCHIVE)/gdb-$(GDB_VER).tar.xz | $(TARGET_DIR)
 	$(REMOVE)/gdb-$(GDB_VER)
 	$(UNTAR)/gdb-$(GDB_VER).tar.xz
-	set -e; cd $(BUILD_TMP)/gdb-$(GDB_VER); \
+	$(CHDIR)/gdb-$(GDB_VER); \
 		$(CONFIGURE) \
 			--prefix= \
 			--mandir=$(BUILD_TMP)/.remove \
@ -69,10 +85,11 @@ $(D)/gdb: $(D)/zlib $(D)/libncurses $(ARCHIVE)/gdb-$(GDB_VER).tar.xz | $(TARGET_
 			--disable-werror \
 			--with-curses \
 			--with-zlib \
-			--enable-static; \
+			--enable-static \
+			; \
 		$(MAKE) all-gdb; \
 		make install-gdb prefix=$(TARGET_DIR)
 	rm -rf $(TARGET_DIR)/share/gdb/system-gdbinit
 	find $(TARGET_DIR)/share/gdb/syscalls -type f -not -name 'arm-linux.xml' -not -name 'gdb-syscalls.dtd' -print0 | xargs -0 rm --
 	$(REMOVE)/gdb-$(GDB_VER)
-	touch $@
+	$(TOUCH)
--- a/make/environment.mk
+++ b/make/environment.mk
@ -267,6 +267,9 @@ PATCH = patch -p1 -i $(PATCHES)
 # wget tarballs into archive directory
 WGET = wget -t3 -T60 -c -P $(ARCHIVE)

+CHDIR = set -e; cd $(BUILD_TMP)
+TOUCH = @touch $@
+
 CONFIGURE_OPTS = \
 	--build=$(BUILD) --host=$(TARGET)

--- a/make/ffmpeg-arm.mk
+++ b/make/ffmpeg-arm.mk
@ -351,10 +351,10 @@ $(D)/ffmpeg: $(FFMPEG_DEPS) $(ARCHIVE)/$(FFMPEG_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/ffmpeg-$(FFMPEG_VER)
 	$(UNTAR)/$(FFMPEG_SOURCE)
 ifneq ($(FFMPEG_UNPATCHED), yes)
-	set -e; cd $(BUILD_TMP)/ffmpeg-$(FFMPEG_VER); \
+	$(CHDIR)/ffmpeg-$(FFMPEG_VER); \
 		$(call apply_patches, $(FFMPEG_PATCH))
 endif
-	set -e; cd $(BUILD_TMP)/ffmpeg-$(FFMPEG_VER); \
+	$(CHDIR)/ffmpeg-$(FFMPEG_VER); \
 		./configure \
 			$(FFMPEG_CONFIGURE_GENERIC) \
 			$(FFMPEG_CONFIGURE_PLATFORM) \
@ -369,4 +369,4 @@ endif
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libswresample.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libswscale.pc
 	$(REMOVE)/ffmpeg-$(FFMPEG_VER)
-	touch $@
+	$(TOUCH)
--- a/make/ffmpeg-cst.mk
+++ b/make/ffmpeg-cst.mk
@ -176,9 +176,9 @@ endif
 $(D)/ffmpeg: $(FFMPEG_DEPS) | $(TARGET_DIR)
 	$(REMOVE)/$(NI_FFMPEG)
 	cd $(SOURCE_DIR)/$(NI_FFMPEG) && \
-		git checkout $(NI_FFMPEG_BRANCH) && \
+		git checkout $(NI_FFMPEG_BRANCH)
 	tar -C $(SOURCE_DIR) -cp $(NI_FFMPEG) --exclude-vcs | tar -C $(BUILD_TMP) -x
-	cd $(BUILD_TMP)/$(NI_FFMPEG) && \
+	$(CHDIR)/$(NI_FFMPEG); \
 		./configure \
 			$(FFMPEG_CONFIGURE_GENERIC) \
 			$(FFMPEG_CONFIGURE_PLATFORM) \
@ -193,4 +193,4 @@ $(D)/ffmpeg: $(FFMPEG_DEPS) | $(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libswresample.pc
 	$(REMOVE)/$(NI_FFMPEG)
-	touch $@
+	$(TOUCH)
--- a/make/gstreamer.mk
+++ b/make/gstreamer.mk
@ -1,5 +1,7 @@
 # makefile to build gstreamer and all it's dependencies

+# -----------------------------------------------------------------------------
+
 # change to activate debug
 GSTREAMER_DEBUG = yes

@ -10,6 +12,8 @@ ifeq ($(GSTREAMER_DEBUG), yes)
  GST_PLUGIN_CONFIG_DEBUG = --enable-debug
 endif

+# -----------------------------------------------------------------------------
+
 #
 # gstreamer
 #
@ -21,7 +25,8 @@ $(ARCHIVE)/$(GSTREAMER_SOURCE):

 $(D)/gstreamer: $(D)/libglib2 $(D)/libxml2 $(D)/glib-networking $(ARCHIVE)/$(GSTREAMER_SOURCE)
 	$(UNTAR)/$(GSTREAMER_SOURCE)
-	set -e; cd $(BUILD_TMP)/gstreamer-$(GSTREAMER_VER); \
+	$(REMOVE)/gstreamer-$(GSTREAMER_VER)
+	$(CHDIR)/gstreamer-$(GSTREAMER_VER); \
 		$(PATCH)/gstreamer-$(GSTREAMER_VER)-revert-use-new-gst-adapter-get-buffer.patch; \
 		./autogen.sh --noconfigure; \
 		$(CONFIGURE) \
@ -40,7 +45,7 @@ $(D)/gstreamer: $(D)/libglib2 $(D)/libxml2 $(D)/glib-networking $(ARCHIVE)/$(GST
 			--disable-benchmarks \
 			--disable-gtk-doc-html \
 			ac_cv_header_valgrind_valgrind_h=no \
-		; \
+			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-1.0.pc
@ -55,7 +60,9 @@ $(D)/gstreamer: $(D)/libglib2 $(D)/libxml2 $(D)/glib-networking $(ARCHIVE)/$(GST
 	$(REWRITE_LIBTOOLDEP)/libgstcontroller-1.0.la
 	$(REWRITE_LIBTOOLDEP)/libgstnet-1.0.la
 	$(REMOVE)/gstreamer-$(GSTREAMER_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 #
 # gst_plugins_base
@ -67,8 +74,9 @@ $(ARCHIVE)/$(GST_PLUGINS_BASE_SOURCE):
 	$(WGET) https://gstreamer.freedesktop.org/src/gst-plugins-base/$(GST_PLUGINS_BASE_SOURCE)

 $(D)/gst_plugins_base: $(D)/zlib $(D)/libglib2 $(D)/orc $(D)/gstreamer $(D)/alsa-lib $(D)/libogg $(D)/libvorbisidec $(ARCHIVE)/$(GST_PLUGINS_BASE_SOURCE)
+	$(REMOVE)/gst-plugins-base-$(GST_PLUGINS_BASE_VER)
 	$(UNTAR)/$(GST_PLUGINS_BASE_SOURCE)
-	set -e; cd $(BUILD_TMP)/gst-plugins-base-$(GST_PLUGINS_BASE_VER); \
+	$(CHDIR)/gst-plugins-base-$(GST_PLUGINS_BASE_VER); \
 		$(PATCH)/gst-plugins-base-$(GSTREAMER_VER)-Makefile.am-don-t-hardcode-libtool-name-when-running.patch; \
 		$(PATCH)/gst-plugins-base-$(GSTREAMER_VER)-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch; \
 		$(PATCH)/gst-plugins-base-$(GSTREAMER_VER)-riff-media-added-fourcc-to-all-ffmpeg-mpeg4-video-caps.patch; \
@ -83,11 +91,12 @@ $(D)/gst_plugins_base: $(D)/zlib $(D)/libglib2 $(D)/orc $(D)/gstreamer $(D)/alsa
 			$(GST_PLUGIN_CONFIG_DEBUG) \
 			--disable-examples \
 			--disable-gtk-doc-html \
-		; \
+			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
-		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done
+		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \
+	done
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-allocators-1.0.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-app-1.0.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-audio-1.0.pc
@ -123,7 +132,9 @@ $(D)/gst_plugins_base: $(D)/zlib $(D)/libglib2 $(D)/orc $(D)/gstreamer $(D)/alsa
 	$(REWRITE_LIBTOOLDEP)/libgsttag-1.0.la
 	$(REWRITE_LIBTOOLDEP)/libgstvideo-1.0.la
 	$(REMOVE)/gst-plugins-base-$(GST_PLUGINS_BASE_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 #
 # gst_plugins_good
@ -135,8 +146,9 @@ $(ARCHIVE)/$(GST_PLUGINS_GOOD_SOURCE):
 	$(WGET) https://gstreamer.freedesktop.org/src/gst-plugins-good/$(GST_PLUGINS_GOOD_SOURCE)

 $(D)/gst_plugins_good: $(D)/libpng $(D)/libjpeg $(D)/gstreamer $(D)/gst_plugins_base $(D)/libsoup $(D)/libFLAC $(ARCHIVE)/$(GST_PLUGINS_GOOD_SOURCE)
+	$(REMOVE)/gst-plugins-good-$(GST_PLUGINS_GOOD_VER)
 	$(UNTAR)/$(GST_PLUGINS_GOOD_SOURCE)
-	set -e; cd $(BUILD_TMP)/gst-plugins-good-$(GST_PLUGINS_GOOD_VER); \
+	$(CHDIR)/gst-plugins-good-$(GST_PLUGINS_GOOD_VER); \
 		$(PATCH)/gst-plugins-good-$(GSTREAMER_VER)-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch; \
 		./autogen.sh --noconfigure; \
 		$(CONFIGURE) \
@ -147,13 +159,16 @@ $(D)/gst_plugins_good: $(D)/libpng $(D)/libjpeg $(D)/gstreamer $(D)/gst_plugins_
 			$(GST_PLUGIN_CONFIG_DEBUG) \
 			--disable-examples \
 			--disable-gtk-doc-html \
-		; \
+			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
-		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done
+		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \
+	done
 	$(REMOVE)/gst-plugins-good-$(GST_PLUGINS_GOOD_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 #
 # gst_plugins_bad
@ -165,8 +180,9 @@ $(ARCHIVE)/$(GST_PLUGINS_BAD_SOURCE):
 	$(WGET) https://gstreamer.freedesktop.org/src/gst-plugins-bad/$(GST_PLUGINS_BAD_SOURCE)

 $(D)/gst_plugins_bad: $(D)/libass $(D)/libcurl $(D)/libxml2 $(D)/openssl $(D)/librtmp $(D)/gstreamer $(D)/gst_plugins_base $(ARCHIVE)/$(GST_PLUGINS_BAD_SOURCE)
+	$(REMOVE)/gst-plugins-bad-$(GST_PLUGINS_BAD_VER)
 	$(UNTAR)/$(GST_PLUGINS_BAD_SOURCE)
-	set -e; cd $(BUILD_TMP)/gst-plugins-bad-$(GST_PLUGINS_BAD_VER); \
+	$(CHDIR)/gst-plugins-bad-$(GST_PLUGINS_BAD_VER); \
 		$(PATCH)/gst-plugins-bad-$(GSTREAMER_VER)-Makefile.am-don-t-hardcode-libtool-name-when-running-pbad.patch; \
 		$(PATCH)/gst-plugins-bad-$(GSTREAMER_VER)-rtmp-fix-seeking-and-potential-segfault.patch; \
 		$(PATCH)/gst-plugins-bad-$(GSTREAMER_VER)-rtmp-hls-tsdemux-fix.patch; \
@ -185,11 +201,12 @@ $(D)/gst_plugins_bad: $(D)/libass $(D)/libcurl $(D)/libxml2 $(D)/openssl $(D)/li
 			$(GST_PLUGIN_CONFIG_DEBUG) \
 			--disable-examples \
 			--disable-gtk-doc-html \
-		; \
+			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
-		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done
+		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \
+	done
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-codecparsers-1.0.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-bad-audio-1.0.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gstreamer-bad-base-1.0.pc
@ -213,7 +230,9 @@ $(D)/gst_plugins_bad: $(D)/libass $(D)/libcurl $(D)/libxml2 $(D)/openssl $(D)/li
 	$(REWRITE_LIBTOOLDEP)/libgstadaptivedemux-1.0.la
 	$(REWRITE_LIBTOOLDEP)/libgstbadvideo-1.0.la
 	$(REMOVE)/gst-plugins-bad-$(GST_PLUGINS_BAD_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 #
 # gst_plugins_ugly
@ -225,8 +244,9 @@ $(ARCHIVE)/$(GST_PLUGINS_UGLY_SOURCE):
 	$(WGET) https://gstreamer.freedesktop.org/src/gst-plugins-ugly/$(GST_PLUGINS_UGLY_SOURCE)

 $(D)/gst_plugins_ugly: $(D)/gstreamer $(D)/gst_plugins_base $(ARCHIVE)/$(GST_PLUGINS_UGLY_SOURCE)
+	$(REMOVE)/gst-plugins-ugly-$(GST_PLUGINS_UGLY_VER)
 	$(UNTAR)/$(GST_PLUGINS_UGLY_SOURCE)
-	set -e; cd $(BUILD_TMP)/gst-plugins-ugly-$(GST_PLUGINS_UGLY_VER); \
+	$(CHDIR)/gst-plugins-ugly-$(GST_PLUGINS_UGLY_VER); \
 		./autogen.sh --noconfigure; \
 		$(CONFIGURE) \
 			--prefix= \
@ -236,13 +256,16 @@ $(D)/gst_plugins_ugly: $(D)/gstreamer $(D)/gst_plugins_base $(ARCHIVE)/$(GST_PLU
 			$(GST_PLUGIN_CONFIG_DEBUG) \
 			--disable-examples \
 			--disable-gtk-doc-html \
-		; \
+			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
-		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done
+		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \
+	done
 	$(REMOVE)/gst-plugins-ugly-$(GST_PLUGINS_UGLY_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 #
 # gst_plugin_subsink
@ -254,8 +277,9 @@ $(D)/gst_plugin_subsink: $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plugins_g
 		then cd $(ARCHIVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git; git pull; \
 		else cd $(ARCHIVE); git clone git://github.com/christophecvr/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git; \
 		fi
+	$(REMOVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink
 	cp -ra $(ARCHIVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink.git $(BUILD_TMP)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink
-	set -e; cd $(BUILD_TMP)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink; \
+	$(CHDIR)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink; \
 		aclocal --force -I m4; \
 		libtoolize --copy --ltdl --force; \
 		autoconf --force; \
@ -264,13 +288,16 @@ $(D)/gst_plugin_subsink: $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plugins_g
 		$(CONFIGURE) \
 			--prefix= \
 			--enable-silent-rules \
-		; \
+			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
-		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done
+		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \
+	done
 	$(REMOVE)/gstreamer$(GST_PLUGIN_SUBSINK_VER)-plugin-subsink
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 #
 # gst_plugins_dvbmediasink
@ -282,8 +309,9 @@ $(D)/gst_plugins_dvbmediasink: $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plu
 		then cd $(ARCHIVE)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git; git pull; \
 		else cd $(ARCHIVE); git clone -b gst-1.0 https://github.com/OpenPLi/gst-plugin-dvbmediasink.git gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git; \
 		fi
+	$(REMOVE)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink
 	cp -ra $(ARCHIVE)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink.git $(BUILD_TMP)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink
-	set -e; cd $(BUILD_TMP)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink; \
+	$(CHDIR)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink; \
 		aclocal --force -I m4; \
 		libtoolize --copy --ltdl --force; \
 		autoconf --force; \
@ -303,15 +331,16 @@ $(D)/gst_plugins_dvbmediasink: $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plu
 			--with-vb9 \
 			--with-spark \
 			--with-gstversion=1.0 \
-		; \
+			; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	for i in `cd $(TARGET_DIR)/lib/gstreamer-1.0; echo *.la`; do \
-		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; done
+		$(REWRITE_LIBTOOL)/gstreamer-1.0/$$i; \
+	done
 	$(REMOVE)/gstreamer$(GST_PLUGINS_DVBMEDIASINK_VER)-plugin-dvbmediasink
-	touch $@
+	$(TOUCH)

-##########################################################################################################
+# -----------------------------------------------------------------------------

 #
 # orc
@ -323,12 +352,13 @@ $(ARCHIVE)/$(ORC_SOURCE):
 	$(WGET) https://gstreamer.freedesktop.org/src/orc/$(ORC_SOURCE)

 $(D)/orc: $(ARCHIVE)/$(ORC_SOURCE)
+	$(REMOVE)/orc-$(ORC_VER)
 	$(UNTAR)/$(ORC_SOURCE)
-	set -e; cd $(BUILD_TMP)/orc-$(ORC_VER); \
+	$(CHDIR)/orc-$(ORC_VER); \
 		$(CONFIGURE) \
 			--datarootdir=/.remove \
 			--prefix= \
-		; \
+			; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/orc-0.4.pc
@ -337,7 +367,9 @@ $(D)/orc: $(ARCHIVE)/$(ORC_SOURCE)
 	$(REWRITE_LIBTOOLDEP)/liborc-test-0.4.la
 	rm -f $(addprefix $(TARGET_DIR)/bin/,orc-bugreport orcc)
 	$(REMOVE)/orc-$(ORC_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 #
 # libdca
@ -349,12 +381,13 @@ $(ARCHIVE)/$(LIBDCA_SOURCE):
 	$(WGET) http://download.videolan.org/pub/videolan/libdca/$(LIBDCA_VER)/$(LIBDCA_SOURCE)

 $(D)/libdca: $(ARCHIVE)/$(LIBDCA_SOURCE)
+	$(REMOVE)/libdca-$(LIBDCA_VER)
 	$(UNTAR)/$(LIBDCA_SOURCE)
-	set -e; cd $(BUILD_TMP)/libdca-$(LIBDCA_VER); \
+	$(CHDIR)/libdca-$(LIBDCA_VER); \
 		$(CONFIGURE) \
 			--prefix= \
 			--mandir=/.remove \
-		; \
+			; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libdca.pc
@ -362,7 +395,9 @@ $(D)/libdca: $(ARCHIVE)/$(LIBDCA_SOURCE)
 	$(REWRITE_LIBTOOL)/libdca.la
 	rm -f $(addprefix $(TARGET_DIR)/bin/,extract_dca extract_dts)
 	$(REMOVE)/libdca-$(LIBDCA_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 #
 # nettle
@ -374,19 +409,22 @@ $(ARCHIVE)/$(NETTLE_SOURCE):
 	$(WGET) https://ftp.gnu.org/gnu/nettle/$(NETTLE_SOURCE)

 $(D)/nettle: $(D)/gmp $(ARCHIVE)/$(NETTLE_SOURCE)
+	$(REMOVE)/nettle-$(NETTLE_VER)
 	$(UNTAR)/$(NETTLE_SOURCE)
-	set -e; cd $(BUILD_TMP)/nettle-$(NETTLE_VER); \
+	$(CHDIR)/nettle-$(NETTLE_VER); \
 		$(CONFIGURE) \
 			--prefix= \
 			--disable-documentation \
-		; \
+			; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/hogweed.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/nettle.pc
 	rm -f $(addprefix $(TARGET_DIR)/bin/,sexp-conv nettle-hash nettle-pbkdf2 nettle-lfib-stream pkcs1-conv)
 	$(REMOVE)/nettle-$(NETTLE_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 #
 # gmp
@ -400,17 +438,20 @@ $(ARCHIVE)/$(GMP_SOURCE):
 	$(WGET) ftp://ftp.gmplib.org/pub/gmp-$(GMP_VER_MAJOR)/$(GMP_SOURCE)

 $(D)/gmp: $(ARCHIVE)/$(GMP_SOURCE)
+	$(REMOVE)/gmp-$(GMP_VER_MAJOR)
 	$(UNTAR)/$(GMP_SOURCE)
-	set -e; cd $(BUILD_TMP)/gmp-$(GMP_VER_MAJOR); \
+	$(CHDIR)/gmp-$(GMP_VER_MAJOR); \
 		$(CONFIGURE) \
 			--prefix= \
 			--infodir=/.remove \
-		; \
+			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libgmp.la
 	$(REMOVE)/gmp-$(GMP_VER_MAJOR)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 #
 # gnutls
@ -424,8 +465,9 @@ $(ARCHIVE)/$(GNUTLS_SOURCE):
 	$(WGET) ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VER_MAJOR)/$(GNUTLS_SOURCE)

 $(D)/gnutls: $(D)/nettle $(D)/ca-bundle $(ARCHIVE)/$(GNUTLS_SOURCE)
+	$(REMOVE)/gnutls-$(GNUTLS_VER)
 	$(UNTAR)/$(GNUTLS_SOURCE)
-	set -e; cd $(BUILD_TMP)/gnutls-$(GNUTLS_VER); \
+	$(CHDIR)/gnutls-$(GNUTLS_VER); \
 		$(CONFIGURE) \
 			--prefix= \
 			--mandir=/.remove \
@ -439,7 +481,7 @@ $(D)/gnutls: $(D)/nettle $(D)/ca-bundle $(ARCHIVE)/$(GNUTLS_SOURCE)
 			--disable-guile \
 			--disable-doc \
 			--without-p11-kit \
-		; \
+			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gnutls.pc
@ -448,7 +490,9 @@ $(D)/gnutls: $(D)/nettle $(D)/ca-bundle $(ARCHIVE)/$(GNUTLS_SOURCE)
 	$(REWRITE_LIBTOOLDEP)/libgnutlsxx.la
 	rm -f $(addprefix $(TARGET_DIR)/bin/,psktool gnutls-cli-debug certtool srptool ocsptool gnutls-serv gnutls-cli)
 	$(REMOVE)/gnutls-$(GNUTLS_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 #
 # glib-networking
@ -462,18 +506,21 @@ $(ARCHIVE)/$(GLIB-NETWORKING_SOURCE):
 	$(WGET) https://ftp.acc.umu.se/pub/GNOME/sources/glib-networking/$(GLIB-NETWORKING_VER_MAJOR)/$(GLIB-NETWORKING_SOURCE)

 $(D)/glib-networking: $(D)/gnutls $(D)/libglib2 $(ARCHIVE)/$(GLIB-NETWORKING_SOURCE)
+	$(REMOVE)/glib-networking-$(GLIB-NETWORKING_VER)
 	$(UNTAR)/$(GLIB-NETWORKING_SOURCE)
-	set -e; cd $(BUILD_TMP)/glib-networking-$(GLIB-NETWORKING_VER); \
+	$(CHDIR)/glib-networking-$(GLIB-NETWORKING_VER); \
 		$(CONFIGURE) \
 			--prefix= \
 			--datadir=/.remove \
 			--datarootdir=/.remove \
 			--localedir=/.remove \
-		; \
+			; \
 		$(MAKE); \
 		$(MAKE) install prefix=$(TARGET_DIR)
 	$(REMOVE)/glib-networking-$(GLIB-NETWORKING_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 #
 # libsoup
@ -487,8 +534,9 @@ $(ARCHIVE)/$(LIBSOUP_SOURCE):
 	$(WGET) https://download.gnome.org/sources/libsoup/$(LIBSOUP_VER_MAJOR)/$(LIBSOUP_SOURCE)

 $(D)/libsoup: $(D)/sqlite $(D)/libxml2 $(D)/libglib2 $(ARCHIVE)/$(LIBSOUP_SOURCE)
+	$(REMOVE)/libsoup-$(LIBSOUP_VER)
 	$(UNTAR)/$(LIBSOUP_SOURCE)
-	set -e; cd $(BUILD_TMP)/libsoup-$(LIBSOUP_VER); \
+	$(CHDIR)/libsoup-$(LIBSOUP_VER); \
 		$(CONFIGURE) \
 			--prefix= \
 			--datarootdir=/.remove \
@ -497,13 +545,15 @@ $(D)/libsoup: $(D)/sqlite $(D)/libxml2 $(D)/libglib2 $(ARCHIVE)/$(LIBSOUP_SOURCE
 			--disable-gtk-doc \
 			--disable-gtk-doc-html \
 			--disable-gtk-doc-pdf \
-		; \
+			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR) itlocaledir=$$(TARGET_DIR)/.remove
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libsoup-2.4.pc
 	$(REWRITE_LIBTOOL)/libsoup-2.4.la
 	$(REMOVE)/libsoup-$(LIBSOUP_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 #
 # sqlite
@ -515,16 +565,17 @@ $(ARCHIVE)/$(SQLITE_SOURCE):
 	$(WGET) http://www.sqlite.org/2017/$(SQLITE_SOURCE)

 $(D)/sqlite: $(ARCHIVE)/$(SQLITE_SOURCE)
+	$(REMOVE)/sqlite-autoconf-$(SQLITE_VER)
 	$(UNTAR)/$(SQLITE_SOURCE)
-	set -e; cd $(BUILD_TMP)/sqlite-autoconf-$(SQLITE_VER); \
+	$(CHDIR)/sqlite-autoconf-$(SQLITE_VER); \
 		$(CONFIGURE) \
 			--prefix= \
 			--mandir=/.remove \
-		; \
+			; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/sqlite3.pc
 	$(REWRITE_LIBTOOL)/libsqlite3.la
 	rm -f $(addprefix $(TARGET_DIR)/bin/,sqlite3)
 	$(REMOVE)/sqlite-autoconf-$(SQLITE_VER)
-	touch $@
+	$(TOUCH)
--- a/make/image-update.mk
+++ b/make/image-update.mk
@ -42,7 +42,7 @@ u-FritzCallMonitor:
 	echo "wget -q \"http://localhost/control/message?popup=FritzCallMonitor%20installed.\" -O /dev/null"	>> $(POSTINSTALL_SH)
 	echo "sleep 5"												>> $(POSTINSTALL_SH)
 	echo "/bin/sync"											>> $(POSTINSTALL_SH)
-	mkdir -pv $(UPDATE_INST_DIR)/bin  && \
+	mkdir -pv $(UPDATE_INST_DIR)/bin && \
 	mkdir -pv $(UPDATE_INST_DIR)/var/tuxbox/config && \
 	cp -f $(BIN)/FritzCallMonitor $(UPDATE_INST_DIR)/bin/ && \
 	cp -f $(TARGET_DIR)/var/tuxbox/config/FritzCallMonitor.cfg $(UPDATE_INST_DIR)/var/tuxbox/config/
@ -221,7 +221,7 @@ pathauf_HD-19:

 u-update-bin:
 	pushd $(BUILD_TMP) && \
-	tar -czvf $(UPDATE_DIR)/$(UPDATE_NAME).bin temp_inst
+		tar -czvf $(UPDATE_DIR)/$(UPDATE_NAME).bin temp_inst
 	echo $(UPDATE_URL)/$(UPDATE_NAME).bin $(UPDATE_TYPE)$(UPDATE_VERSION)$(UPDATE_DATE) `md5sum $(UPDATE_DIR)/$(UPDATE_NAME).bin | cut -c1-32` $(UPDATE_DESC) $(UPDATE_VERSION_STRING) >> $(UPDATE_DIR)/$(UPDATE_MD5FILE)
 	$(MAKE) u-clean

--- a/make/kernel-arm.mk
+++ b/make/kernel-arm.mk
@ -12,18 +12,18 @@ $(D)/kernel-arm: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR)
 		git checkout $(KERNEL_BRANCH) && \
 	tar -C $(SOURCE_DIR) -cp $(NI_LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	cd $(BUILD_TMP) && \
-	mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION) && \
+		mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION)
 	cd $(BUILD_TMP)/linux-$(KERNEL_VERSION) && \
-	touch .scmversion && \
-	cp $(CONFIGS)/kernel-4.10-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config && \
-	mkdir -p $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules && \
+		touch .scmversion && \
+		cp $(CONFIGS)/kernel-4.10-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config && \
+		mkdir -p $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules && \
 		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig && \
 		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules $(DTB_VER) && \
 		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage && \
 		cat $(ZIMAGE) $(DTB) > $(ZIMAGE_DTB) && \
 		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules && \
 		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install && \
-	touch $@
+	$(TOUCH)

 kernel-arm-modules: $(D)/kernel-arm
 	cp -a $(MODULES_DIR)/kernel $(TARGETMODULES)
--- a/make/kernel-cst.mk
+++ b/make/kernel-cst.mk
@ -42,15 +42,15 @@ kernel-cst-install-all:

 $(D)/kernel-cst-hd2: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) $(SOURCE_DIR)/$(NI_DRIVERS-BIN) | $(TARGET_DIR)
 	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \
-		git checkout $(KERNEL_BRANCH) && \
+		git checkout $(KERNEL_BRANCH)
 	tar -C $(SOURCE_DIR) -cp $(NI_LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	cd $(BUILD_TMP) && \
-	mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION) && \
+		mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION)
 	cd $(BUILD_TMP)/linux-$(KERNEL_VERSION) && \
-	touch .scmversion && \
-	cp $(CONFIGS)/kernel-3.10-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config && \
-	sed -i -e 's/SUBLEVEL = 108/SUBLEVEL = 93/g' Makefile && \
-	mkdir -p $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules && \
+		touch .scmversion && \
+		cp $(CONFIGS)/kernel-3.10-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config && \
+		sed -i -e 's/SUBLEVEL = 108/SUBLEVEL = 93/g' Makefile && \
+		mkdir -p $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules && \
 		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig && \
 		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage && \
 		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules && \
@ -64,7 +64,7 @@ ifeq ($(BOXFAMILY), apollo)
 		cp -a $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-apollo-vmlinux.ub.gz
  endif
 endif
-	touch $@
+	$(TOUCH)

 kernel-cst-install-hd2: $(D)/kernel-cst-hd2
 	cp -af $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(KERNEL_DESTDIR)/vmlinux.ub.gz
@ -74,19 +74,19 @@ $(D)/kernel-cst-hd1: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR)
 		git checkout $(KERNEL_BRANCH) && \
 	tar -C $(SOURCE_DIR) -cp $(NI_LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	cd $(BUILD_TMP) && \
-	mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION) && \
+		mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION)
 	cd $(BUILD_TMP)/linux-$(KERNEL_VERSION) && \
-	touch .scmversion && \
-	cp $(CONFIGS)/kernel-$(KERNEL_VERSION).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config && \
-	sed -i -e 's/EXTRAVERSION = .15/EXTRAVERSION = .13/g' Makefile && \
-	mkdir -p $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules && \
+		touch .scmversion && \
+		cp $(CONFIGS)/kernel-$(KERNEL_VERSION).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config && \
+		sed -i -e 's/EXTRAVERSION = .15/EXTRAVERSION = .13/g' Makefile && \
+		mkdir -p $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules && \
 		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig && \
 		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage && \
 		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules && \
 		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install && \
 		mkimage -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(IMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-uImage.img && \
 		mkimage -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img
-	touch $@
+	$(TOUCH)

 kernel-cst-install-hd1: $(D)/kernel-cst-hd1
 	cp -af $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img $(KERNEL_DESTDIR)/zImage
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@ -177,14 +177,14 @@ $(D)/neutrino: $(N_OBJDIR)/config.status
 	$(MAKE) -C $(N_OBJDIR) all     DESTDIR=$(TARGET_DIR)
 	$(MAKE) -C $(N_OBJDIR) install DESTDIR=$(NEUTRINO_INST_DIR)
 	make $(TARGET_DIR)/.version
-	touch $@
+	$(TOUCH)

 $(D)/libstb-hal: $(LH_OBJDIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
 	$(MAKE) -C $(LH_OBJDIR) all     DESTDIR=$(TARGET_DIR)
 	$(MAKE) -C $(LH_OBJDIR) install DESTDIR=$(NEUTRINO_INST_DIR)
 	$(REWRITE_LIBTOOL)/libstb-hal.la
-	touch $@
+	$(TOUCH)

 neutrino-bin:
 ifeq ($(CLEAN), yes)
--- a/make/plugins-extra.mk
+++ b/make/plugins-extra.mk
@ -4,8 +4,9 @@
 links: $(SOURCE_DIR)/$(TUXBOX_PLUGINS) $(LIBPLUG)/links.so

 $(LIBPLUG)/links.so: $(D)/zlib $(D)/openssl $(D)/libpng $(D)/libjpeg $(D)/giflib $(LIBPLUG) $(VARCONF)
+	$(REMOVE)/links
 	tar -C $(SOURCE_DIR)/$(TUXBOX_PLUGINS) -cp links --exclude-vcs | tar -C $(BUILD_TMP) -x
-	cd $(BUILD_TMP)/links && \
+	$(CHDIR)/links && \
 		export CC=$(TARGET)-gcc && \
 		export AR=$(TARGET)-ar && \
 		export NM=$(TARGET)-nm && \
--- a/make/plugins.mk
+++ b/make/plugins.mk
@ -240,9 +240,9 @@ openvpn-setup: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUG) $(ETCINIT)
 neutrino-mediathek: $(LIBPLUG)
 	$(REMOVE)/$@
 	git clone https://github.com/neutrino-mediathek/mediathek.git $(BUILD_TMP)/$@
-	pushd $(BUILD_TMP)/$@ && \
-	cp -a plugins/* $(LIBPLUG)/ && \
-	cp -a share $(TARGET_DIR)
+	$(CHDIR)/$@; \
+		cp -a plugins/* $(LIBPLUG)/; \
+		cp -a share $(TARGET_DIR)
 	$(REMOVE)/$@

 #scripts-lua
--- a/make/rootfs.mk
+++ b/make/rootfs.mk
@ -28,9 +28,7 @@ endif

 update.urls: $(TARGET_DIR)/var/etc/update.urls
 $(TARGET_DIR)/var/etc/update.urls:
-	rm -f $@
-	touch $@
-	echo "$(NI-SERVER)/update.php"				>> $@
+	echo "$(NI-SERVER)/update.php"				 > $@
 	echo "$(CHANLIST_URL)/$(CHANLIST_MD5FILE)"		>> $@

 # create filesystem for our images
--- a/make/static.mk
+++ b/make/static.mk
@ -9,9 +9,10 @@ endif

 cortex-strings: $(STATIC_LIB_DIR)/libcortex-strings.la
 $(STATIC_LIB_DIR)/libcortex-strings.la: $(ARCHIVE)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2 | $(TARGET_DIR)
+	$(REMOVE)/cortex-strings-$(CORTEX-STRINGS_VER)
 	$(UNTAR)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2
-	pushd $(BUILD_TMP)/cortex-strings-$(CORTEX-STRINGS_VER) && \
-		./autogen.sh && \
+	$(CHDIR)/cortex-strings-$(CORTEX-STRINGS_VER); \
+		./autogen.sh; \
 		CFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)" \
 		CPPFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)" \
 		CXXFLAGS="-pipe -O2 $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)" \
@ -21,8 +22,9 @@ $(STATIC_LIB_DIR)/libcortex-strings.la: $(ARCHIVE)/cortex-strings-$(CORTEX-STRIN
 			--prefix= \
 			--disable-shared \
 			--enable-static \
-			$(CORTEX-STRINGS_CONF) && \
-		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(STATIC_DIR) && \
+			$(CORTEX-STRINGS_CONF) \
+			; \
+		$(MAKE); \
+		$(MAKE) install DESTDIR=$(STATIC_DIR)
 	$(REWRITE_LIBTOOL_STATIC)/libcortex-strings.la
 	$(REMOVE)/cortex-strings-$(CORTEX-STRINGS_VER)
--- a/make/system-libs-extra.mk
+++ b/make/system-libs-extra.mk
@ -1,31 +1,38 @@
 # makefile to build system libs (currently unused in ni-image)

+# -----------------------------------------------------------------------------
+
 LIBID3TAG_VER=0.15.1b
 $(ARCHIVE)/libid3tag-$(LIBID3TAG_VER).tar.gz:
 	$(WGET) http://downloads.sourceforge.net/project/mad/libid3tag/$(LIBID3TAG_VER)/libid3tag-$(LIBID3TAG_VER).tar.gz

 $(D)/libid3tag: $(D)/zlib $(ARCHIVE)/libid3tag-$(LIBID3TAG_VER).tar.gz | $(TARGET_DIR)
+	$(REMOVE)/libid3tag-$(LIBID3TAG_VER)
 	$(UNTAR)/libid3tag-$(LIBID3TAG_VER).tar.gz
-	pushd $(BUILD_TMP)/libid3tag-$(LIBID3TAG_VER) && \
-		$(PATCH)/libid3tag.diff && \
+	$(CHDIR)/libid3tag-$(LIBID3TAG_VER); \
+		$(PATCH)/libid3tag.diff; \
 		$(CONFIGURE) \
 			--prefix= \
-			--enable-shared=yes && \
-		$(MAKE) all && \
-		make install DESTDIR=$(TARGET_DIR) && \
+			--enable-shared=yes \
+			; \
+		$(MAKE) all; \
+		make install DESTDIR=$(TARGET_DIR); \
 		sed "s!^prefix=.*!prefix=$(TARGET_DIR)!;" id3tag.pc > $(PKG_CONFIG_PATH)/libid3tag.pc
 	$(REWRITE_LIBTOOL)/libid3tag.la
 	$(REMOVE)/libid3tag-$(LIBID3TAG_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 LIBFLAC_VER=1.3.2
 $(ARCHIVE)/flac-$(LIBFLAC_VER).tar.xz:
 	$(WGET) http://prdownloads.sourceforge.net/sourceforge/flac/flac-$(LIBFLAC_VER).tar.xz

 $(D)/libFLAC: $(ARCHIVE)/flac-$(LIBFLAC_VER).tar.xz | $(TARGET_DIR)
+	$(REMOVE)/flac-$(LIBFLAC_VER)
 	$(UNTAR)/flac-$(LIBFLAC_VER).tar.xz
 	cp -f $(HELPERS_DIR)/new_autoconfig/* $(BUILD_TMP)/flac-$(LIBFLAC_VER)
-	set -e; cd $(BUILD_TMP)/flac-$(LIBFLAC_VER); \
+	$(CHDIR)/flac-$(LIBFLAC_VER); \
 		$(CONFIGURE) \
 			--prefix= \
 			--datarootdir=/.remove \
@ -34,31 +41,36 @@ $(D)/libFLAC: $(ARCHIVE)/flac-$(LIBFLAC_VER).tar.xz | $(TARGET_DIR)
 			--disable-cpplibs \
 			--disable-xmms-plugin \
 			--disable-ogg \
-			--disable-altivec; \
-		$(MAKE) all && \
-		make install DESTDIR=$(TARGET_DIR) && \
+			--disable-altivec \
+			; \
+		$(MAKE) all; \
+		make install DESTDIR=$(TARGET_DIR); \
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/flac.pc
 	$(REWRITE_LIBTOOL)/libFLAC.la
 	rm -rf $(TARGET_DIR)/bin/flac
 	rm -rf $(TARGET_DIR)/bin/metaflac
 	$(REMOVE)/flac-$(LIBFLAC_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 LIBROXML_VER=2.3.0
 $(ARCHIVE)/libroxml-$(LIBROXML_VER).tar.gz:
 	$(WGET) http://download.libroxml.net/pool/v2.x/libroxml-$(LIBROXML_VER).tar.gz

 $(D)/libroxml: $(ARCHIVE)/libroxml-$(LIBROXML_VER).tar.gz | $(TARGET_DIR)
+	$(REMOVE)/libroxml-$(LIBROXML_VER)
 	$(UNTAR)/libroxml-$(LIBROXML_VER).tar.gz
-	set -e; cd $(BUILD_TMP)/libroxml-$(LIBROXML_VER); \
+	$(CHDIR)/libroxml-$(LIBROXML_VER); \
 		$(CONFIGURE) \
 			--prefix= \
 			--disable-xml-read-write \
 			--enable-xml-small-input-file \
 			--disable-xml-commit-xml-tree \
 			--disable-xml-xpath-engine \
+			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-		$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libroxml.pc
+	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libroxml.pc
 	$(REMOVE)/libroxml-$(LIBROXML_VER)
-	touch $@
+	$(TOUCH)
--- a/make/system-libs.mk
+++ b/make/system-libs.mk
--- a/make/system-tools-extra.mk
+++ b/make/system-tools-extra.mk
@ -1,21 +1,25 @@
 # makefile to build extra system tools (mostly unused)

+# -----------------------------------------------------------------------------
+
 # usbutils-008 needs udev
 USB_UTILS_VER=007
 $(ARCHIVE)/usbutils-$(USB_UTILS_VER).tar.xz:
 	$(WGET) https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-$(USB_UTILS_VER).tar.xz

 $(D)/usbutils: $(D)/libusb_compat $(ARCHIVE)/usbutils-$(USB_UTILS_VER).tar.xz | $(TARGET_DIR)
+	$(REMOVE)/usbutils-$(USB_UTILS_VER)
 	$(UNTAR)/usbutils-$(USB_UTILS_VER).tar.xz
-	cd $(BUILD_TMP)/usbutils-$(USB_UTILS_VER) && \
-	$(PATCH)/usbutils-avoid-dependency-on-bash.patch && \
-	$(PATCH)/usbutils-fix-null-pointer-crash.patch && \
+	$(CHDIR)/usbutils-$(USB_UTILS_VER); \
+		$(PATCH)/usbutils-avoid-dependency-on-bash.patch; \
+		$(PATCH)/usbutils-fix-null-pointer-crash.patch; \
 		$(CONFIGURE) \
 			--target=$(TARGET) \
 			--prefix= \
 			--mandir=/.remove \
-			--infodir=/.remove && \
-		$(MAKE) && \
+			--infodir=/.remove \
+			; \
+		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	rm -rf $(TARGET_DIR)/bin/lsusb.py
 	rm -rf $(TARGET_DIR)/bin/usbhid-dump
@ -23,15 +27,18 @@ $(D)/usbutils: $(D)/libusb_compat $(ARCHIVE)/usbutils-$(USB_UTILS_VER).tar.xz |
 	rm -rf $(TARGET_DIR)/share/pkgconfig
 	rm -rf $(TARGET_DIR)/share/usb.ids.gz
 	$(REMOVE)/usbutils-$(USB_UTILS_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 BINUTILS_VER=2.25
 $(ARCHIVE)/binutils-$(BINUTILS_VER).tar.bz2:
 	$(WGET) https://ftp.gnu.org/gnu/binutils/binutils-$(BINUTILS_VER).tar.bz2

 $(D)/binutils: $(ARCHIVE)/binutils-$(BINUTILS_VER).tar.bz2 | $(TARGET_DIR)
+	$(REMOVE)/binutils-$(BINUTILS_VER)
 	$(UNTAR)/binutils-$(BINUTILS_VER).tar.bz2
-	cd $(BUILD_TMP)/binutils-$(BINUTILS_VER) && \
+	$(CHDIR)/binutils-$(BINUTILS_VER); \
 		$(CONFIGURE) \
 			--target=$(TARGET) \
 			--prefix= \
@ -40,43 +47,52 @@ $(D)/binutils: $(ARCHIVE)/binutils-$(BINUTILS_VER).tar.bz2 | $(TARGET_DIR)
 			--disable-plugins \
 			--enable-build-warnings=no \
 			--disable-sim \
-			--disable-gdb && \
+			--disable-gdb \
+			; \
 		$(MAKE)
 		install -m755 $(BUILD_TMP)/binutils-$(BINUTILS_VER)/binutils/objdump $(BIN)/
 		install -m755 $(BUILD_TMP)/binutils-$(BINUTILS_VER)/binutils/objcopy $(BIN)/
 	$(REMOVE)/binutils-$(BINUTILS_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 UTIL-LINUX_VER=2.29
 $(ARCHIVE)/util-linux-$(UTIL-LINUX_VER).tar.xz:
 	$(WGET) https://www.kernel.org/pub/linux/utils/util-linux/v$(UTIL-LINUX_VER)/util-linux-$(UTIL-LINUX_VER).tar.xz

 $(D)/util-linux: $(D)/libncurses $(ARCHIVE)/util-linux-$(UTIL-LINUX_VER).tar.xz | $(TARGET_DIR)
+	$(REMOVE)/util-linux-$(UTIL-LINUX_VER)
 	$(UNTAR)/util-linux-$(UTIL-LINUX_VER).tar.xz
-	cd $(BUILD_TMP)/util-linux-$(UTIL-LINUX_VER) && \
-		autoreconf -fi && \
+	$(CHDIR)/util-linux-$(UTIL-LINUX_VER); \
+		autoreconf -fi; \
 		$(CONFIGURE) \
 			--prefix= \
 			--build=$(BUILD) \
 			--host=$(TARGET) \
 			--enable-static \
 			--disable-shared \
-			--mandir=/.remove && \
-		$(MAKE) sfdisk && \
+			--mandir=/.remove \
+			; \
+		$(MAKE) sfdisk; \
 		install -m755 sfdisk $(TARGET_DIR)/sbin/sfdisk
 	$(REMOVE)/util-linux-$(UTIL-LINUX_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 IPTABLES_VER = 1.4.21
 $(ARCHIVE)/iptables-$(IPTABLES_VER).tar.bz2:
 	$(WGET) http://www.netfilter.org/projects/iptables/files/iptables-$(IPTABLES_VER).tar.bz2

 $(D)/iptables: $(ARCHIVE)/iptables-$(IPTABLES_VER).tar.bz2 | $(TARGET_DIR)
+	$(REMOVE)/iptables-$(IPTABLES_VER)
 	$(UNTAR)/iptables-$(IPTABLES_VER).tar.bz2
-	set -e; cd $(BUILD_TMP)/iptables-$(IPTABLES_VER); \
+	$(CHDIR)/iptables-$(IPTABLES_VER); \
 		$(CONFIGURE) \
 			--prefix= \
-			--mandir=/.remove; \
+			--mandir=/.remove \
+			; \
 		$(MAKE); \
 		make install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libip4tc.la
@ -88,30 +104,36 @@ $(D)/iptables: $(ARCHIVE)/iptables-$(IPTABLES_VER).tar.bz2 | $(TARGET_DIR)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libiptc.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/xtables.pc
 	$(REMOVE)/iptables-$(IPTABLES_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 LIGHTTPD_VER=1.4.31
 $(ARCHIVE)/lighttpd-$(LIGHTTPD_VER).tar.gz:
 	$(WGET) http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-$(LIGHTTPD_VER).tar.gz

 $(D)/lighttpd: $(D)/zlib $(ARCHIVE)/lighttpd-$(LIGHTTPD_VER).tar.gz | $(TARGET_DIR)
+	$(REMOVE)/lighttpd-$(LIGHTTPD_VER)
 	$(UNTAR)/lighttpd-$(LIGHTTPD_VER).tar.gz
-	cd $(BUILD_TMP)/lighttpd-$(LIGHTTPD_VER) && \
-	$(BUILDENV) ./configure \
-		--build=$(BUILD) \
-		--host=$(TARGET) \
-		--prefix= \
-		--mandir=/.remove \
-		--docdir=/.remove \
-		--infodir=/.remove \
-		--with-zlib \
-		--enable-silent-rules \
-		--without-pcre \
-		--without-bzip2 && \
-	$(MAKE) && \
-	$(MAKE) install DESTDIR=$(TARGET_DIR)
+	$(CHDIR)/lighttpd-$(LIGHTTPD_VER); \
+		$(BUILDENV) ./configure \
+			--build=$(BUILD) \
+			--host=$(TARGET) \
+			--prefix= \
+			--mandir=/.remove \
+			--docdir=/.remove \
+			--infodir=/.remove \
+			--with-zlib \
+			--enable-silent-rules \
+			--without-pcre \
+			--without-bzip2 \
+			; \
+		$(MAKE); \
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REMOVE)/lighttpd-$(LIGHTTPD_VER)
-	touch $@
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 PYTHON_VER=2.7.11
 $(ARCHIVE)/Python-$(PYTHON_VER).tgz:
@ -120,10 +142,10 @@ $(ARCHIVE)/Python-$(PYTHON_VER).tgz:
 $(D)/python: $(ARCHIVE)/Python-$(PYTHON_VER).tgz | $(TARGET_DIR)
 	$(REMOVE)/Python-$(PYTHON_VER)
 	$(UNTAR)/Python-$(PYTHON_VER).tgz
-	pushd $(BUILD_TMP)/Python-$(PYTHON_VER) && \
-		echo "ac_cv_file__dev_ptmx=no" > config.site && \
-		echo "ac_cv_file__dev_ptc=no" >> config.site && \
-		export CONFIG_SITE=config.site && \
+	$(CHDIR)/Python-$(PYTHON_VER); \
+		echo "ac_cv_file__dev_ptmx=no" > config.site; \
+		echo "ac_cv_file__dev_ptc=no" >> config.site; \
+		export CONFIG_SITE=config.site; \
 		./configure; \
 		make python Parser/pgen; \
 		mv python hostpython; \
@ -140,7 +162,7 @@ $(D)/python: $(ARCHIVE)/Python-$(PYTHON_VER).tgz | $(TARGET_DIR)
 			--prefix= \
 			--enable-shared \
 			--disable-ipv6 \
-		; \
+			; \
 		make \
 			HOSTPYTHON=./hostpython \
 			HOSTPGEN=./Parser/hostpgen \
@ -149,7 +171,7 @@ $(D)/python: $(ARCHIVE)/Python-$(PYTHON_VER).tgz | $(TARGET_DIR)
 			CROSS_COMPILE_TARGET=yes \
 			HOSTARCH=$(TARGET) \
 			BUILDARCH=$(BUILD) \
-		; \
+			; \
 		make install \
 			HOSTPYTHON=./hostpython \
 			HOSTPGEN=./Parser/hostpgen \
@ -157,12 +179,15 @@ $(D)/python: $(ARCHIVE)/Python-$(PYTHON_VER).tgz | $(TARGET_DIR)
 			CROSS_COMPILE=$(TARGET)- \
 			CROSS_COMPILE_TARGET=yes \
 			prefix=$(BUILD_TMP)/Python-$(PYTHON_VER)/_install \
-		; \
+			; \
 		cp -a $(BUILD_TMP)/Python-$(PYTHON_VER)/_install/lib/python* $(TARGET_LIB_DIR)/
 		cp -a $(BUILD_TMP)/Python-$(PYTHON_VER)/_install/lib/libpython* $(TARGET_LIB_DIR)/
 		chmod +w $(TARGET_LIB_DIR)/libpython*
 		install -m755 $(BUILD_TMP)/Python-$(PYTHON_VER)/_install/bin/python $(TARGET_DIR)/bin/
 	$(REMOVE)/Python-$(PYTHON_VER)
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------

 $(D)/astra-sm: $(D)/openssl | $(TARGET_DIR)
 	# workaround unrecognized command line options
@ -170,14 +195,13 @@ $(D)/astra-sm: $(D)/openssl | $(TARGET_DIR)

 $(D)/astra-sm-no-march-cflags:
 	$(REMOVE)/astra-sm
-	cd $(BUILD_TMP); \
-	git clone https://gitlab.com/crazycat69/astra-sm.git astra-sm; \
-	cd astra-sm; \
+	git clone https://gitlab.com/crazycat69/astra-sm.git $(BUILD_TMP)/astra-sm; \
+	$(CHDIR)/astra-sm; \
 		autoreconf -fi; \
 		$(CONFIGURE) \
 			--prefix= \
 			--without-lua-compiler \
-		; \
+			; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REMOVE)/astra-sm
-	touch $@
+	$(TOUCH)
--- a/make/system-tools.mk
+++ b/make/system-tools.mk