- modify last changes

6 years ago · 89dcf09ae3
8 changed files with 455 additions and 455 deletions
--- a/make/target-development.mk
+++ b/make/target-development.mk
@ -8,7 +8,7 @@ valgrind: valgrind-$(BOXSERIES)
 # -----------------------------------------------------------------------------

 VALGRIND_VER    = 3.13.0
-VALGRIND        = valgrind-$(VALGRIND_VER)
+VALGRIND_TMP    = valgrind-$(VALGRIND_VER)
 VALGRIND_SOURCE = valgrind-$(VALGRIND_VER).tar.bz2
 VALGRIND_URL    = ftp://sourceware.org/pub/valgrind

@ -20,9 +20,9 @@ VALGRIND_PATCH  = valgrind-fix-$(BOXSERIES)-build.patch
 $(D)/valgrind-bre2ze4k \
 $(D)/valgrind-hd51 \
 $(D)/valgrind-hd2: $(ARCHIVE)/$(VALGRIND_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(VALGRIND)
+	$(REMOVE)/$(VALGRIND_TMP)
 	$(UNTAR)/$(VALGRIND_SOURCE)
-	$(CHDIR)/$(VALGRIND); \
+	$(CHDIR)/$(VALGRIND_TMP); \
 		$(call apply_patches, $(VALGRIND_PATCH)); \
 		export AR=$(TARGET)-ar; \
 		autoreconf -fi; \
@ -37,7 +37,7 @@ $(D)/valgrind-hd2: $(ARCHIVE)/$(VALGRIND_SOURCE) | $(TARGET_DIR)
 	$(REWRITE_PKGCONF)/valgrind.pc
 	rm -f $(addprefix $(TARGET_LIB_DIR)/valgrind/,*.a *.xml)
 	rm -f $(addprefix $(TARGET_BIN_DIR)/,cg_* callgrind_* ms_print)
-	$(REMOVE)/$(VALGRIND)
+	$(REMOVE)/$(VALGRIND_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -67,7 +67,7 @@ $(D)/valgrind-hd1:
 # -----------------------------------------------------------------------------

 STRACE_VER    = 5.1
-STRACE        = strace-$(STRACE_VER)
+STRACE_TMP    = strace-$(STRACE_VER)
 STRACE_SOURCE = strace-$(STRACE_VER).tar.xz
 STRACE_URL    = https://strace.io/files/$(STRACE_VER)

@ -75,9 +75,9 @@ $(ARCHIVE)/$(STRACE_SOURCE):
 	$(DOWNLOAD) $(STRACE_URL)/$(STRACE_SOURCE)

 $(D)/strace: $(ARCHIVE)/$(STRACE_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(STRACE)
+	$(REMOVE)/$(STRACE_TMP)
 	$(UNTAR)/$(STRACE_SOURCE)
-	$(CHDIR)/$(STRACE); \
+	$(CHDIR)/$(STRACE_TMP); \
 		$(CONFIGURE) \
 			--prefix= \
 			--mandir=/.remove \
@ -86,13 +86,13 @@ $(D)/strace: $(ARCHIVE)/$(STRACE_SOURCE) | $(TARGET_DIR)
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	rm -f $(addprefix $(TARGET_BIN_DIR)/,strace-graph strace-log-merge)
-	$(REMOVE)/$(STRACE)
+	$(REMOVE)/$(STRACE_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 GDB_VER    = 8.1.1
-GDB        = gdb-$(GDB_VER)
+GDB_TMP    = gdb-$(GDB_VER)
 GDB_SOURCE = gdb-$(GDB_VER).tar.xz
 GDB_URL    = https://sourceware.org/pub/gdb/releases

@ -100,9 +100,9 @@ $(ARCHIVE)/$(GDB_SOURCE):
 	$(DOWNLOAD) $(GDB_URL)/$(GDB_SOURCE)

 $(D)/gdb: $(D)/zlib $(D)/ncurses $(ARCHIVE)/$(GDB_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(GDB)
+	$(REMOVE)/$(GDB_TMP)
 	$(UNTAR)/$(GDB_SOURCE)
-	$(CHDIR)/$(GDB); \
+	$(CHDIR)/$(GDB_TMP); \
 		$(CONFIGURE) \
 			--prefix= \
 			--mandir=/.remove \
@ -117,7 +117,7 @@ $(D)/gdb: $(D)/zlib $(D)/ncurses $(ARCHIVE)/$(GDB_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install-gdb DESTDIR=$(TARGET_DIR)
 	rm -rf $(addprefix $(TARGET_SHARE_DIR)/,system-gdbinit)
 	find $(TARGET_SHARE_DIR)/gdb/syscalls -type f -not -name 'arm-linux.xml' -not -name 'gdb-syscalls.dtd' -print0 | xargs -0 rm --
-	$(REMOVE)/$(GDB)
+	$(REMOVE)/$(GDB_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
--- a/make/target-ffmpeg-armbox.mk
+++ b/make/target-ffmpeg-armbox.mk
@ -4,7 +4,7 @@
 # -----------------------------------------------------------------------------

 FFMPEG_VER    = 4.1.3
-FFMPEG        = ffmpeg-$(FFMPEG_VER)
+FFMPEG_TMP    = ffmpeg-$(FFMPEG_VER)
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VER).tar.xz
 FFMPEG_URL    = http://www.ffmpeg.org/releases

@ -351,13 +351,13 @@ FFMPEG_CONFIGURE_PLATFORM = \
 # -----------------------------------------------------------------------------

 $(D)/ffmpeg: $(FFMPEG_DEPS) $(ARCHIVE)/$(FFMPEG_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(FFMPEG)
+	$(REMOVE)/$(FFMPEG_TMP)
 	$(UNTAR)/$(FFMPEG_SOURCE)
 ifneq ($(FFMPEG_UNPATCHED), yes)
-	$(CHDIR)/$(FFMPEG); \
+	$(CHDIR)/$(FFMPEG_TMP); \
 		$(call apply_patches, $(FFMPEG_PATCH))
 endif
-	$(CHDIR)/$(FFMPEG); \
+	$(CHDIR)/$(FFMPEG_TMP); \
 		./configure \
 			$(FFMPEG_CONFIGURE_GENERIC) \
 			$(FFMPEG_CONFIGURE_PLATFORM) \
@ -371,5 +371,5 @@ endif
 	$(REWRITE_PKGCONF)/libavutil.pc
 	$(REWRITE_PKGCONF)/libswresample.pc
 	$(REWRITE_PKGCONF)/libswscale.pc
-	$(REMOVE)/$(FFMPEG)
+	$(REMOVE)/$(FFMPEG_TMP)
 	$(TOUCH)
--- a/make/target-libs-static.mk
+++ b/make/target-libs-static.mk
@ -13,7 +13,7 @@ static-libs: $(STATIC_LIBS)
 # -----------------------------------------------------------------------------

 CORTEX-STRINGS_VER    = 48fd30c
-CORTEX-STRINGS        = cortex-strings-$(CORTEX-STRINGS_VER)
+CORTEX-STRINGS_TMP    = cortex-strings-$(CORTEX-STRINGS_VER)
 CORTEX-STRINGS_SOURCE = cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2
 CORTEX-STRINGS_URL    = http://git.linaro.org/git-ro/toolchain/cortex-strings.git

@ -27,9 +27,9 @@ endif

 cortex-strings: $(STATIC_LIB_DIR)/libcortex-strings.la
 $(STATIC_LIB_DIR)/libcortex-strings.la: $(ARCHIVE)/$(CORTEX-STRINGS_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(CORTEX-STRINGS)
+	$(REMOVE)/$(CORTEX-STRINGS_TMP)
 	$(UNTAR)/$(CORTEX-STRINGS_SOURCE)
-	$(CHDIR)/$(CORTEX-STRINGS); \
+	$(CHDIR)/$(CORTEX-STRINGS_TMP); \
 		./autogen.sh; \
 		CFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_INCLUDE_DIR)" \
 		CPPFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_INCLUDE_DIR)" \
@ -45,7 +45,7 @@ $(STATIC_LIB_DIR)/libcortex-strings.la: $(ARCHIVE)/$(CORTEX-STRINGS_SOURCE) | $(
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(STATIC_DIR)
 	$(REWRITE_LIBTOOL_STATIC)/libcortex-strings.la
-	$(REMOVE)/$(CORTEX-STRINGS)
+	$(REMOVE)/$(CORTEX-STRINGS_TMP)

 # -----------------------------------------------------------------------------

--- a/make/target-libs-unused.mk
+++ b/make/target-libs-unused.mk
@ -4,7 +4,7 @@
 # -----------------------------------------------------------------------------

 LIBID3TAG_VER    = 0.15.1b
-LIBID3TAG        = libid3tag-$(LIBID3TAG_VER)
+LIBID3TAG_TMP    = libid3tag-$(LIBID3TAG_VER)
 LIBID3TAG_SOURCE = libid3tag-$(LIBID3TAG_VER).tar.gz
 LIBID3TAG_URL    = https://sourceforge.net/projects/mad/files/libid3tag/$(LIBID3TAG_VER)

@ -14,9 +14,9 @@ $(ARCHIVE)/$(LIBID3TAG_SOURCE):
 LIBID3TAG_PATCH  = libid3tag-pc.patch

 $(D)/libid3tag: $(D)/zlib $(ARCHIVE)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LIBID3TAG)
+	$(REMOVE)/$(LIBID3TAG_TMP)
 	$(UNTAR)/$(LIBID3TAG_SOURCE)
-	$(CHDIR)/$(LIBID3TAG); \
+	$(CHDIR)/$(LIBID3TAG_TMP); \
 		$(call apply_patches, $(LIBID3TAG_PATCH)); \
 		autoreconf -fi; \
 		$(CONFIGURE) \
@ -27,13 +27,13 @@ $(D)/libid3tag: $(D)/zlib $(ARCHIVE)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF)/id3tag.pc
 	$(REWRITE_LIBTOOL)/libid3tag.la
-	$(REMOVE)/$(LIBID3TAG)
+	$(REMOVE)/$(LIBID3TAG_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 FLAC_VER    = 1.3.2
-FLAC        = flac-$(FLAC_VER)
+FLAC_TMP    = flac-$(FLAC_VER)
 FLAC_SOURCE = flac-$(FLAC_VER).tar.xz
 FLAC_URL    = https://ftp.osuosl.org/pub/xiph/releases/flac

@ -41,9 +41,9 @@ $(ARCHIVE)/$(FLAC_SOURCE):
 	$(DOWNLOAD) $(FLAC_URL)/$(FLAC_SOURCE)

 $(D)/libFLAC: $(ARCHIVE)/$(FLAC_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LIBFLAC)
+	$(REMOVE)/$(LIBFLAC_TMP)
 	$(UNTAR)/$(LIBFLAC_SOURCE)
-	$(CHDIR)/$(LIBFLAC); \
+	$(CHDIR)/$(LIBFLAC_TMP); \
 		autoreconf -fi; \
 		$(CONFIGURE) \
 			--prefix= \
@ -61,13 +61,13 @@ $(D)/libFLAC: $(ARCHIVE)/$(FLAC_SOURCE) | $(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libFLAC.la
 	rm -rf $(TARGET_DIR)/bin/flac
 	rm -rf $(TARGET_DIR)/bin/metaflac
-	$(REMOVE)/$(LIBFLAC)
+	$(REMOVE)/$(LIBFLAC_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 LIBROXML_VER    = 2.3.0
-LIBROXML        = libroxml-$(LIBROXML_VER)
+LIBROXML_TMP    = libroxml-$(LIBROXML_VER)
 LIBROXML_SOURCE = libroxml-$(LIBROXML_VER).tar.gz
 LIBROXML_URL    = http://download.libroxml.net/pool/v2.x

@ -75,9 +75,9 @@ $(ARCHIVE)/$(LIBROXML_SOURCE):
 	$(DOWNLOAD) $(LIBROXML_URL)/$(LIBROXML_SOURCE)

 $(D)/libroxml: $(ARCHIVE)/$(LIBROXML_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LIBROXML)
+	$(REMOVE)/$(LIBROXML_TMP)
 	$(UNTAR)/$(LIBROXML_SOURCE)
-	$(CHDIR)/$(LIBROXML); \
+	$(CHDIR)/$(LIBROXML_TMP); \
 		$(CONFIGURE) \
 			--prefix= \
 			--disable-xml-read-write \
@ -88,13 +88,13 @@ $(D)/libroxml: $(ARCHIVE)/$(LIBROXML_SOURCE) | $(TARGET_DIR)
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF)/libroxml.pc
-	$(REMOVE)/$(LIBROXML)
+	$(REMOVE)/$(LIBROXML_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 BZIP2_VER    = 1.0.7
-BZIP2        = bzip2-$(BZIP2_VER)
+BZIP2_TMP    = bzip2-$(BZIP2_VER)
 BZIP2_SOURCE = bzip2-$(BZIP2_VER).tar.gz
 BZIP2_URL    = https://sourceware.org/pub/bzip2

@ -104,22 +104,22 @@ $(ARCHIVE)/$(BZIP2_SOURCE):
 BZIP2_PATCH  = bzip2.patch

 $(D)/bzip2: $(ARCHIVE)/$(BZIP2_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(BZIP2)
+	$(REMOVE)/$(BZIP2_TMP)
 	$(UNTAR)/$(BZIP2_SOURCE)
-	$(CHDIR)/$(BZIP2); \
+	$(CHDIR)/$(BZIP2_TMP); \
 		$(call apply_patches, $(BZIP2_PATCH)); \
 		mv Makefile-libbz2_so Makefile; \
 		$(BUILDENV) \
 		$(MAKE) all; \
 		$(MAKE) install PREFIX=$(TARGET_DIR)
 	rm -f $(TARGET_DIR)/bin/bzip2
-	$(REMOVE)/$(BZIP2)
+	$(REMOVE)/$(BZIP2_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 FONTCONFIG_VER    = 2.11.93
-FONTCONFIG        = fontconfig-$(FONTCONFIG_VER)
+FONTCONFIG_TMP    = fontconfig-$(FONTCONFIG_VER)
 FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VER).tar.bz2
 FONTCONFIG_URL    = https://www.freedesktop.org/software/fontconfig/release

@ -127,9 +127,9 @@ $(ARCHIVE)/$(FONTCONFIG_SOURCE):
 	$(DOWNLOAD) $(FONTCONFIG_URL)/$(FONTCONFIG_SOURCE)

 $(D)/fontconfig: $(D)/freetype $(D)/expat $(ARCHIVE)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(FONTCONFIG)
+	$(REMOVE)/$(FONTCONFIG_TMP)
 	$(UNTAR)/$(FONTCONFIG_SOURCE)
-	$(CHDIR)/$(FONTCONFIG); \
+	$(CHDIR)/$(FONTCONFIG_TMP); \
 		$(CONFIGURE) \
 			--prefix= \
 			--with-freetype-config=$(HOST_DIR)/bin/freetype-config \
@ -142,13 +142,13 @@ $(D)/fontconfig: $(D)/freetype $(D)/expat $(ARCHIVE)/$(FONTCONFIG_SOURCE) | $(TA
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libfontconfig.la
 	$(REWRITE_PKGCONF)/fontconfig.pc
-	$(REMOVE)/$(FONTCONFIG)
+	$(REMOVE)/$(FONTCONFIG_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 PIXMAN_VER    = 0.34.0
-PIXMAN        = pixman-$(PIXMAN_VER)
+PIXMAN_TMP    = pixman-$(PIXMAN_VER)
 PIXMAN_SOURCE = pixman-$(PIXMAN_VER).tar.gz
 PIXMAN_URL    = https://www.cairographics.org/releases

@ -160,9 +160,9 @@ PIXMAN_PATCH += pixman-asm_include.patch
 PIXMAN_PATCH += pixman-0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch

 $(D)/pixman: $(D)/zlib $(D)/libpng $(ARCHIVE)/$(PIXMAN_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(PIXMAN)
+	$(REMOVE)/$(PIXMAN_TMP)
 	$(UNTAR)/$(PIXMAN_SOURCE)
-	$(CHDIR)/$(PIXMAN); \
+	$(CHDIR)/$(PIXMAN_TMP); \
 		$(call apply_patches, $(PIXMAN_PATCH)); \
 		$(CONFIGURE) \
 			--prefix= \
@ -175,13 +175,13 @@ $(D)/pixman: $(D)/zlib $(D)/libpng $(ARCHIVE)/$(PIXMAN_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libpixman-1.la
 	$(REWRITE_PKGCONF)/pixman-1.pc
-	$(REMOVE)/$(PIXMAN)
+	$(REMOVE)/$(PIXMAN_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 CAIRO_VER    = 1.16.0
-CAIRO        = cairo-$(CAIRO_VER)
+CAIRO_TMP    = cairo-$(CAIRO_VER)
 CAIRO_SOURCE = cairo-$(CAIRO_VER).tar.xz
 CAIRO_URL    = https://www.cairographics.org/releases

@ -191,9 +191,9 @@ $(ARCHIVE)/$(CAIRO_SOURCE):
 CAIRO_PATCH  = cairo-get_bitmap_surface.diff

 $(D)/cairo: $(D)/fontconfig $(D)/glib2 $(D)/libpng $(D)/pixman $(D)/zlib $(ARCHIVE)/$(CAIRO_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(CAIRO)
+	$(REMOVE)/$(CAIRO_TMP)
 	$(UNTAR)/$(CAIRO_SOURCE)
-	$(CHDIR)/$(CAIRO); \
+	$(CHDIR)/$(CAIRO_TMP); \
 		$(call apply_patches, $(CAIRO_PATCH)); \
 		$(BUILDENV) \
 		ax_cv_c_float_words_bigendian="no" \
@ -228,13 +228,13 @@ $(D)/cairo: $(D)/fontconfig $(D)/glib2 $(D)/libpng $(D)/pixman $(D)/zlib $(ARCHI
 	$(REWRITE_PKGCONF)/cairo-script.pc
 	$(REWRITE_PKGCONF)/cairo-svg.pc
 	$(REWRITE_PKGCONF)/cairo-tee.pc
-	$(REMOVE)/$(CAIRO)
+	$(REMOVE)/$(CAIRO_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 HARFBUZZ_VER    = 1.8.8
-HARFBUZZ        = harfbuzz-$(HARFBUZZ_VER)
+HARFBUZZ_TMP    = harfbuzz-$(HARFBUZZ_VER)
 HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VER).tar.bz2
 HARFBUZZ_URL    = https://www.freedesktop.org/software/harfbuzz/release

@ -244,9 +244,9 @@ $(ARCHIVE)/$(HARFBUZZ_SOURCE):
 HARFBUZZ_PATCH  = harfbuzz-disable-docs.patch

 $(D)/harfbuzz: $(D)/fontconfig $(D)/glib2 $(D)/cairo $(D)/freetype $(ARCHIVE)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(HARFBUZZ)
+	$(REMOVE)/$(HARFBUZZ_TMP)
 	$(UNTAR)/$(HARFBUZZ_SOURCE)
-	$(CHDIR)/$(HARFBUZZ); \
+	$(CHDIR)/$(HARFBUZZ_TMP); \
 		$(call apply_patches, $(HARFBUZZ_PATCH)); \
 		autoreconf -fi; \
 		$(CONFIGURE) \
@ -264,5 +264,5 @@ $(D)/harfbuzz: $(D)/fontconfig $(D)/glib2 $(D)/cairo $(D)/freetype $(ARCHIVE)/$(
 	$(REWRITE_LIBTOOL)/libharfbuzz-subset.la
 	$(REWRITE_PKGCONF)/harfbuzz.pc
 	$(REWRITE_PKGCONF)/harfbuzz-subset.pc
-	$(REMOVE)/$(HARFBUZZ)
+	$(REMOVE)/$(HARFBUZZ_TMP)
 	$(TOUCH)
--- a/make/target-libs.mk
+++ b/make/target-libs.mk
--- a/make/target-lua.mk
+++ b/make/target-lua.mk
@ -3,9 +3,9 @@
 #
 # -----------------------------------------------------------------------------

+LUA_ABIVER = 5.2
 LUA_VER    = 5.2.4
-LUA_ABIVER = $(basename $(LUA_VER))
-LUA        = lua-$(LUA_VER)
+LUA_TMP    = lua-$(LUA_VER)
 LUA_SOURCE = lua-$(LUA_VER).tar.gz
 LUA_URL    = https://www.lua.org

@ -20,9 +20,9 @@ LUA_PATCH += lua-03-lua-pc.patch
 LUA_PATCH += lua-04-crashfix.diff

 $(D)/lua: $(D)/ncurses $(ARCHIVE)/$(LUA_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LUA)
+	$(REMOVE)/$(LUA_TMP)
 	$(UNTAR)/$(LUA_SOURCE)
-	$(CHDIR)/$(LUA); \
+	$(CHDIR)/$(LUA_TMP); \
 		$(call apply_patches, $(LUA_PATCH)); \
 		sed -i 's/^V=.*/V= $(LUA_ABIVER)/' etc/lua.pc; \
 		sed -i 's/^R=.*/R= $(LUA_VER)/' etc/lua.pc; \
@ -34,18 +34,18 @@ $(D)/lua: $(D)/ncurses $(ARCHIVE)/$(LUA_SOURCE) | $(TARGET_DIR)
 			RANLIB=$(TARGET)-ranlib \
 			LDFLAGS="$(TARGET_LDFLAGS)"; \
 		$(MAKE) install INSTALL_TOP=$(TARGET_DIR)
-	install -D -m 0755 $(BUILD_TMP)/lua-$(LUA_VER)/src/liblua.so.$(LUA_VER) $(TARGET_LIB_DIR)/liblua.so.$(LUA_VER)
+	install -D -m 0755 $(BUILD_TMP)/$(LUA_TMP)/src/liblua.so.$(LUA_VER) $(TARGET_LIB_DIR)/liblua.so.$(LUA_VER)
 	ln -sf liblua.so.$(LUA_VER) $(TARGET_LIB_DIR)/liblua.so
-	install -D -m 0644 $(BUILD_TMP)/lua-$(LUA_VER)/etc/lua.pc $(PKG_CONFIG_PATH)/lua.pc
+	install -D -m 0644 $(BUILD_TMP)/$(LUA_TMP)/etc/lua.pc $(PKG_CONFIG_PATH)/lua.pc
 	$(REWRITE_PKGCONF)/lua.pc
 	rm -rf $(TARGET_DIR)/bin/luac
-	$(REMOVE)/$(LUA)
+	$(REMOVE)/$(LUA_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 LUAEXPAT_VER    = 1.3.0
-LUAEXPAT        = luaexpat-$(LUAEXPAT_VER)
+LUAEXPAT_TMP    = luaexpat-$(LUAEXPAT_VER)
 LUAEXPAT_SOURCE = luaexpat-$(LUAEXPAT_VER).tar.gz
 LUAEXPAT_URL    = https://matthewwild.co.uk/projects/luaexpat

@ -55,21 +55,21 @@ $(ARCHIVE)/$(LUAEXPAT_SOURCE):
 LUAEXPAT_PATCH  = luaexpat-makefile.patch

 $(D)/luaexpat: $(D)/expat $(D)/lua $(ARCHIVE)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LUAEXPAT)
+	$(REMOVE)/$(LUAEXPAT_TMP)
 	$(UNTAR)/$(LUAEXPAT_SOURCE)
-	$(CHDIR)/$(LUAEXPAT); \
+	$(CHDIR)/$(LUAEXPAT_TMP); \
 		$(call apply_patches, $(LUAEXPAT_PATCH)); \
 		$(BUILDENV) \
 		$(MAKE) \
 			PREFIX=$(TARGET_DIR); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/$(LUAEXPAT)
+	$(REMOVE)/$(LUAEXPAT_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 LUA-FEEDPARSER_VER    = 0.71
-LUA-FEEDPARSER        = lua-feedparser-$(LUA-FEEDPARSER_VER)
+LUA-FEEDPARSER_TMP    = lua-feedparser-$(LUA-FEEDPARSER_VER)
 LUA-FEEDPARSER_SOURCE = lua-feedparser-$(LUA-FEEDPARSER_VER).tar.gz
 LUA-FEEDPARSER_URL    = https://github.com/slact/lua-feedparser/archive

@ -79,13 +79,13 @@ $(ARCHIVE)/$(LUA-FEEDPARSER_SOURCE):
 LUA-FEEDPARSER_PATCH  = lua-feedparser.patch

 $(D)/lua-feedparser: $(D)/luaexpat $(ARCHIVE)/$(LUA-FEEDPARSER_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LUA-FEEDPARSER)
+	$(REMOVE)/$(LUA-FEEDPARSER_TMP)
 	$(UNTAR)/$(LUA-FEEDPARSER_SOURCE)
-	$(CHDIR)/$(LUA-FEEDPARSER); \
+	$(CHDIR)/$(LUA-FEEDPARSER_TMP); \
 		sed -i 's|^PREFIX =|PREFIX ?=|' Makefile; \
 		$(call apply_patches, $(LUA-FEEDPARSER_PATCH)); \
 		$(MAKE) install PREFIX=$(TARGET_DIR)
-	$(REMOVE)/$(LUA-FEEDPARSER)
+	$(REMOVE)/$(LUA-FEEDPARSER_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------
@ -106,15 +106,15 @@ $(D)/luajson: $(ARCHIVE)/$(LUAJSON_SOURCE) | $(TARGET_DIR)
 # -----------------------------------------------------------------------------

 LUACURL_VER    = git
-LUACURL        = lua-curlv3.$(LUACURL_VER)
+LUACURL_TMP    = lua-curlv3.$(LUACURL_VER)
 LUACURL_SOURCE = lua-curlv3.$(LUACURL_VER)
 LUACURL_URL    = https://github.com/lua-curl/$(LUACURL_SOURCE)

 $(D)/luacurl: $(D)/libcurl $(D)/lua | $(TARGET_DIR)
-	$(REMOVE)/$(LUACURL)
+	$(REMOVE)/$(LUACURL_TMP)
 	get-git-source.sh $(LUACURL_URL) $(ARCHIVE)/$(LUACURL_SOURCE)
-	$(CPDIR)/$(LUACURL)
-	$(CHDIR)/$(LUACURL); \
+	$(CPDIR)/$(LUACURL_SOURCE)
+	$(CHDIR)/$(LUACURL_TMP); \
 		$(BUILDENV) \
 		$(MAKE) \
 			LIBDIR=$(TARGET_LIB_DIR) \
@ -122,13 +122,13 @@ $(D)/luacurl: $(D)/libcurl $(D)/lua | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR) \
 			LUA_CMOD=/lib/lua/$(LUA_ABIVER) \
 			LUA_LMOD=/share/lua/$(LUA_ABIVER)
-	$(REMOVE)/$(LUACURL)
+	$(REMOVE)/$(LUACURL_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 LUAPOSIX_VER    = 31
-LUAPOSIX        = luaposix-$(LUAPOSIX_VER)
+LUAPOSIX_TMP    = luaposix-$(LUAPOSIX_VER)
 LUAPOSIX_SOURCE = luaposix-$(LUAPOSIX_VER).tar.gz
 LUAPOSIX_URL    = https://github.com/luaposix/luaposix/archive

@ -153,9 +153,9 @@ $(ARCHIVE)/$(SLINGSHOT_SOURCE):
 	$(DOWNLOAD) $(SLINGSHOT_URL)/v$(SLINGSHOT_VER).tar.gz -O $@

 $(D)/luaposix: $(HOST_LUA) $(D)/lua $(D)/luaexpat $(ARCHIVE)/$(SLINGSHOT_SOURCE) $(ARCHIVE)/$(GNULIB_SOURCE) $(ARCHIVE)/$(LUAPOSIX_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LUAPOSIX)
+	$(REMOVE)/$(LUAPOSIX_TMP)
 	$(UNTAR)/$(LUAPOSIX_SOURCE)
-	$(CHDIR)/$(LUAPOSIX); \
+	$(CHDIR)/$(LUAPOSIX_TMP); \
 		tar -C gnulib --strip=1 -xf $(ARCHIVE)/$(GNULIB_SOURCE); \
 		tar -C slingshot --strip=1 -xf $(ARCHIVE)/$(SLINGSHOT_SOURCE); \
 		$(call apply_patches, $(LUAPOSIX_PATCH)); \
@ -173,5 +173,5 @@ $(D)/luaposix: $(HOST_LUA) $(D)/lua $(D)/luaexpat $(ARCHIVE)/$(SLINGSHOT_SOURCE)
 			; \
 		$(MAKE); \
 		$(MAKE) all check install
-	$(REMOVE)/$(LUAPOSIX)
+	$(REMOVE)/$(LUAPOSIX_TMP)
 	$(TOUCH)
--- a/make/target-tools-unused.mk
+++ b/make/target-tools-unused.mk
@ -5,7 +5,7 @@

 # usbutils-008 needs udev
 USBUTILS_VER    = 007
-USBUTILS        = usbutils-$(USBUTILS_VER)
+USBUTILS_TMP    = usbutils-$(USBUTILS_VER)
 USBUTILS_SOURCE = usbutils-$(USBUTILS_VER).tar.xz
 USBUTILS_URL    = https://www.kernel.org/pub/linux/utils/usb/usbutils

@ -16,9 +16,9 @@ USBUTILS_PATCH  = usbutils-avoid-dependency-on-bash.patch
 USBUTILS_PATCH += usbutils-fix-null-pointer-crash.patch

 $(D)/usbutils: $(D)/libusb-compat $(ARCHIVE)/$(USBUTILS_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(USBUTILS)
+	$(REMOVE)/$(USBUTILS_TMP)
 	$(UNTAR)/$(USBUTILS_SOURCE)
-	$(CHDIR)/$(USBUTILS); \
+	$(CHDIR)/$(USBUTILS_TMP); \
 		$(call apply_patches, $(USBUTILS_PATCH)); \
 		$(CONFIGURE) \
 			--target=$(TARGET) \
@ -33,13 +33,13 @@ $(D)/usbutils: $(D)/libusb-compat $(ARCHIVE)/$(USBUTILS_SOURCE) | $(TARGET_DIR)
 	rm -rf $(TARGET_DIR)/sbin/update-usbids.sh
 	rm -rf $(TARGET_SHARE_DIR)/pkgconfig
 	rm -rf $(TARGET_SHARE_DIR)/usb.ids.gz
-	$(REMOVE)/$(USBUTILS)
+	$(REMOVE)/$(USBUTILS_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 BINUTILS_VER    = 2.25
-BINUTILS        = binutils-$(BINUTILS_VER)
+BINUTILS_TMP    = binutils-$(BINUTILS_VER)
 BINUTILS_SOURCE = binutils-$(BINUTILS_VER).tar.bz2
 BINUTILS_URL    = https://ftp.gnu.org/gnu/binutils

@ -47,9 +47,9 @@ $(ARCHIVE)/$(BINUTILS_SOURCE):
 	$(DOWNLOAD) $(BINUTILS_URL)/$(BINUTILS_SOURCE)

 $(D)/binutils: $(ARCHIVE)/$(BINUTILS_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(BINUTILS)
+	$(REMOVE)/$(BINUTILS_TMP)
 	$(UNTAR)/$(BINUTILS_SOURCE)
-	$(CHDIR)/$(BINUTILS); \
+	$(CHDIR)/$(BINUTILS_TMP); \
 		$(CONFIGURE) \
 			--target=$(TARGET) \
 			--prefix= \
@ -63,14 +63,14 @@ $(D)/binutils: $(ARCHIVE)/$(BINUTILS_SOURCE) | $(TARGET_DIR)
 		$(MAKE); \
 		install -m 0755 binutils/objdump $(TARGET_BIN_DIR)/
 		install -m 0755 binutils/objcopy $(TARGET_BIN_DIR)/
-	$(REMOVE)/$(BINUTILS)
+	$(REMOVE)/$(BINUTILS_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 UTIL_LINUX_ABIVER = 2.34
 UTIL_LINUX_VER    = 2.34
-UTIL_LINUX        = util-linux-$(UTIL_LINUX_VER)
+UTIL_LINUX_TMP    = util-linux-$(UTIL_LINUX_VER)
 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VER).tar.xz
 UTIL_LINUX_URL    = https://www.kernel.org/pub/linux/utils/util-linux/v$(UTIL_LINUX_ABIVER)

@ -78,9 +78,9 @@ $(ARCHIVE)/$(UTIL_LINUX_SOURCE):
 	$(DOWNLOAD) $(UTIL_LINUX_URL)/$(UTIL_LINUX_SOURCE)

 $(D)/util-linux: $(D)/ncurses $(D)/zlib $(ARCHIVE)/$(UTIL_LINUX_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(UTIL-LINUX)
+	$(REMOVE)/$(UTIL-LINUX_TMP)
 	$(UNTAR)/$(UTIL-LINUX_SOURCE)
-	$(CHDIR)/$(UTIL-LINUX); \
+	$(CHDIR)/$(UTIL-LINUX_TMP); \
 		autoreconf -fi; \
 		$(CONFIGURE) \
 			--prefix= \
@ -115,36 +115,36 @@ $(D)/util-linux: $(D)/ncurses $(D)/zlib $(ARCHIVE)/$(UTIL_LINUX_SOURCE) | $(TARG
 	$(REWRITE_LIBTOOL)/libfdisk.la
 	$(REWRITE_LIBTOOL)/libsmartcols.la
 	$(REWRITE_LIBTOOL)/libuuid.la
-	$(REMOVE)/$(UTIL-LINUX)
+	$(REMOVE)/$(UTIL-LINUX_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 ASTRA-SM_VER    = git
-ASTRA-SM        = astra-sm.$(ASTRA-SM_VER)
+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.git

 # workaround unrecognized command line options
 $(D)/astra-sm: TARGET_ABI=""
 $(D)/astra-sm: $(D)/openssl | $(TARGET_DIR)
-	$(REMOVE)/$(ASTRA-SM)
+	$(REMOVE)/$(ASTRA-SM_TMP)
 	get-git-source.sh $(ASTRA-SM_URL)/$(ASTRA-SM_SOURCE) $(ARCHIVE)/$(ASTRA-SM_SOURCE)
 	$(CPDIR)/$(ASTRA-SM_SOURCE)
-	$(CHDIR)/$(ASTRA-SM); \
+	$(CHDIR)/$(ASTRA-SM_TMP); \
 		autoreconf -fi; \
 		$(CONFIGURE) \
 			--prefix= \
 			--without-lua \
 			; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/$(ASTRA-SM)
+	$(REMOVE)/$(ASTRA-SM_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 IOZONE_VER    = 482
-IOZONE        = iozone3_$(IOZONE_VER)
+IOZONE_TMP    = iozone3_$(IOZONE_VER)
 IOZONE_SOURCE = iozone3_$(IOZONE_VER).tar
 IOZONE_URL    = http://www.iozone.org/src/current

@ -152,21 +152,21 @@ $(ARCHIVE)/$(IOZONE_SOURCE):
 	$(DOWNLOAD) $(IOZONE_URL)/$(IOZONE_SOURCE)

 $(D)/iozone3: $(ARCHIVE)/$(IOZONE_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(IOZONE)
+	$(REMOVE)/$(IOZONE_TMP)
 	$(UNTAR)/$(IOZONE_SOURCE)
-	$(CHDIR)/$(IOZONE)/src/current; \
+	$(CHDIR)/$(IOZONE_TMP)/src/current; \
 		sed -i -e "s/= gcc/= $(TARGET)-gcc/" makefile; \
 		sed -i -e "s/= cc/= $(TARGET)-cc/" makefile; \
 		$(BUILDENV) \
 		$(MAKE) linux-arm; \
 		install -m 0755 iozone $(TARGET_BIN_DIR)/
-	$(REMOVE)/$(IOZONE)
+	$(REMOVE)/$(IOZONE_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 RSYNC_VER    = 3.1.3
-RSYNC        = rsync-$(RSYNC_VER)
+RSYNC_TMP    = rsync-$(RSYNC_VER)
 RSYNC_SOURCE = rsync-$(RSYNC_VER).tar.gz
 RSYNC_URL    = https://ftp.samba.org/pub/rsync

@ -174,9 +174,9 @@ $(ARCHIVE)/$(RSYNC_SOURCE):
 	$(DOWNLOAD) $(RSYNC_URL)/$(RSYNC_SOURCE)

 $(D)/rsync: $(ARCHIVE)/$(RSYNC_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(RSYNC)
+	$(REMOVE)/$(RSYNC_TMP)
 	$(UNTAR)/$(RSYNC_SOURCE)
-	$(CHDIR)/$(RSYNC); \
+	$(CHDIR)/$(RSYNC_TMP); \
 		$(CONFIGURE) \
 			--prefix= \
 			--mandir=/.remove \
@ -186,13 +186,13 @@ $(D)/rsync: $(ARCHIVE)/$(RSYNC_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE) all; \
 		$(MAKE) install-all DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/$(RSYNC)
+	$(REMOVE)/$(RSYNC_TMP)
 	$(TOUCH)

 # -----------------------------------------------------------------------------

 READLINE_VER    = 8.0
-READLINE        = readline-$(READLINE_VER)
+READLINE_TMP    = readline-$(READLINE_VER)
 READLINE_SOURCE = readline-$(READLINE_VER).tar.gz
 READLINE_URL    = https://ftp.gnu.org/gnu/readline

@ -200,9 +200,9 @@ $(ARCHIVE)/$(READLINE_SOURCE):
 	$(DOWNLOAD) $(READLINE_URL)/$(READLINE_SOURCE)

 $(D)/readline: $(ARCHIVE)/$(READLINE_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(READLINE)
+	$(REMOVE)/$(READLINE_TMP)
 	$(UNTAR)/$(READLINE_SOURCE)
-	$(CHDIR)/$(READLINE); \
+	$(CHDIR)/$(READLINE_TMP); \
 		$(CONFIGURE) \
 			--prefix= \
 			--datarootdir=/.remove/share \
@ -210,5 +210,5 @@ $(D)/readline: $(ARCHIVE)/$(READLINE_SOURCE) | $(TARGET_DIR)
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF)/readline.pc
-	$(REMOVE)/$(READLINE)
+	$(REMOVE)/$(READLINE_TMP)
 	$(TOUCH)
--- a/make/target-tools.mk
+++ b/make/target-tools.mk