From 341ef6d7f3dde40cca2dfd0cc37d9bc9e1e151db Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Mon, 8 Jun 2020 00:23:41 +0200
Subject: [PATCH] - use rewrite libtool libraries automatically

---
 make/neutrino.mk            |  2 +-
 make/target-libs-unused.mk  | 16 ++++-----
 make/target-libs.mk         | 68 ++++++++++++++++---------------------
 make/target-tools-unused.mk |  4 +--
 make/target-tools.mk        |  9 +++--
 5 files changed, 42 insertions(+), 57 deletions(-)

diff --git a/make/neutrino.mk b/make/neutrino.mk
index 4c07e4cc..20d1dc71 100644
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -217,7 +217,7 @@ 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)
-	$(REWRITE_LIBTOOL)/libstb-hal.la
+	$(REWRITE_LIBTOOL_LA)
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
diff --git a/make/target-libs-unused.mk b/make/target-libs-unused.mk
index 97556178..4535cbd3 100644
--- a/make/target-libs-unused.mk
+++ b/make/target-libs-unused.mk
@@ -28,7 +28,7 @@ libid3tag: $(LIBID3TAG_DEPS) $(ARCHIVE)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR)
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF)/id3tag.pc
-	$(REWRITE_LIBTOOL)/libid3tag.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(LIBID3TAG_TMP)
 	$(TOUCH)
 
@@ -60,7 +60,7 @@ libFLAC: $(ARCHIVE)/$(FLAC_SOURCE) | $(TARGET_DIR)
 		$(MAKE) all; \
 		make install DESTDIR=$(TARGET_DIR); \
 	$(REWRITE_PKGCONF)/flac.pc
-	$(REWRITE_LIBTOOL)/libFLAC.la
+	$(REWRITE_LIBTOOL_LA)
 	rm -rf $(TARGET_DIR)/bin/flac
 	rm -rf $(TARGET_DIR)/bin/metaflac
 	$(REMOVE)/$(LIBFLAC_TMP)
@@ -117,7 +117,7 @@ fontconfig: $(FONTCONFIG_DEPS) $(ARCHIVE)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL)/libfontconfig.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/fontconfig.pc
 	$(REMOVE)/$(FONTCONFIG_TMP)
 	$(TOUCH)
@@ -152,7 +152,7 @@ pixman: $(PIXMAN_DEPS) $(ARCHIVE)/$(PIXMAN_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL)/libpixman-1.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/pixman-1.pc
 	$(REMOVE)/$(PIXMAN_TMP)
 	$(TOUCH)
@@ -195,10 +195,7 @@ cairo: $(CAIRO_DEPS) $(ARCHIVE)/$(CAIRO_SOURCE) | $(TARGET_DIR)
 	rm -rf $(TARGET_LIB_DIR)/cairo/cairo-sphinx*
 	rm -rf $(TARGET_LIB_DIR)/cairo/.debug/cairo-fdr*
 	rm -rf $(TARGET_LIB_DIR)/cairo/.debug/cairo-sphinx*
-	$(REWRITE_LIBTOOL)/libcairo.la
-	$(REWRITE_LIBTOOL)/libcairo-script-interpreter.la
-	$(REWRITE_LIBTOOL)/libcairo-gobject.la
-	$(REWRITE_LIBTOOL)/cairo/libcairo-trace.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/cairo.pc
 	$(REWRITE_PKGCONF)/cairo-fc.pc
 	$(REWRITE_PKGCONF)/cairo-ft.pc
@@ -243,8 +240,7 @@ harfbuzz: $(HARFBUZZ_DEPS) $(ARCHIVE)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL)/libharfbuzz.la
-	$(REWRITE_LIBTOOL)/libharfbuzz-subset.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/harfbuzz.pc
 	$(REWRITE_PKGCONF)/harfbuzz-subset.pc
 	$(REMOVE)/$(HARFBUZZ_TMP)
diff --git a/make/target-libs.mk b/make/target-libs.mk
index 3867c0f3..7843b596 100644
--- a/make/target-libs.mk
+++ b/make/target-libs.mk
@@ -59,8 +59,7 @@ libfuse: $(ARCHIVE)/$(LIBFUSE_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL)/libfuse.la
-	$(REWRITE_LIBTOOL)/libulockmgr.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/fuse.pc
 	rm -rf $(TARGET_DIR)/etc/udev
 	rm -rf $(TARGET_DIR)/etc/init.d/fuse
@@ -88,9 +87,7 @@ libupnp: $(ARCHIVE)/$(LIBUPNP_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR); \
-	$(REWRITE_LIBTOOL)/libixml.la
-	$(REWRITE_LIBTOOL)/libthreadutil.la
-	$(REWRITE_LIBTOOL)/libupnp.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/libupnp.pc
 	$(REMOVE)/$(LIBUPNP_TMP)
 	$(TOUCH)
@@ -118,7 +115,7 @@ libdvbsi: | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		make install DESTDIR=$(TARGET_DIR); \
-	$(REWRITE_LIBTOOL)/libdvbsi++.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/libdvbsi++.pc
 	$(REMOVE)/$(LIBDVBSI_TMP)
 	$(TOUCH)
@@ -192,7 +189,7 @@ libcurl: $(LIBCURL_DEPS) $(ARCHIVE)/$(LIBCURL_SOURCE) | $(TARGET_DIR)
 	mv $(TARGET_BIN_DIR)/curl-config $(HOST_DIR)/bin/
 	$(REWRITE_CONFIG) $(HOST_DIR)/bin/curl-config
 	rm -f $(TARGET_SHARE_DIR)/zsh
-	$(REWRITE_LIBTOOL)/libcurl.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/libcurl.pc
 	$(REMOVE)/$(LIBCURL_TMP)
 	$(TOUCH)
@@ -230,7 +227,7 @@ libpng: $(LIBPNG_DEPS) $(ARCHIVE)/$(LIBPNG_SOURCE) | $(TARGET_DIR)
 	mv $(TARGET_BIN_DIR)/libpng*-config $(HOST_DIR)/bin/
 	$(REWRITE_CONFIG) $(HOST_DIR)/bin/libpng16-config
 	$(REWRITE_PKGCONF)/libpng16.pc
-	$(REWRITE_LIBTOOL)/libpng16.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(LIBPNG_TMP)
 	$(TOUCH)
 
@@ -278,7 +275,7 @@ freetype: $(FREETYPE_DEPS) $(ARCHIVE)/$(FREETYPE_SOURCE) | $(TARGET_DIR)
 	mv $(TARGET_BIN_DIR)/freetype-config $(HOST_DIR)/bin
 	$(REWRITE_CONFIG) $(HOST_DIR)/bin/freetype-config
 	$(REWRITE_PKGCONF)/freetype2.pc
-	$(REWRITE_LIBTOOL)/libfreetype.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(FREETYPE_TMP) \
 		$(TARGET_SHARE_DIR)/aclocal
 	$(TOUCH)
@@ -465,7 +462,7 @@ libusb: $(ARCHIVE)/$(LIBUSB_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		make install DESTDIR=$(TARGET_DIR); \
-	$(REWRITE_LIBTOOL)/libusb-$(basename $(LIBUSB_VER)).la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/libusb-$(basename $(LIBUSB_VER)).pc
 	$(REMOVE)/$(LIBUSB_TMP)
 	$(TOUCH)
@@ -496,7 +493,7 @@ libusb-compat: $(LUBUSB-COMPAT_DEPS) $(ARCHIVE)/$(LIBUSB-COMPAT_SOURCE) | $(TARG
 		make install DESTDIR=$(TARGET_DIR); \
 	mv $(TARGET_BIN_DIR)/libusb-config $(HOST_DIR)/bin
 	$(REWRITE_CONFIG) $(HOST_DIR)/bin/libusb-config
-	$(REWRITE_LIBTOOL)/libusb.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/libusb.pc
 	$(REMOVE)/$(LIBUSB-COMPAT_TMP)
 	$(TOUCH)
@@ -527,7 +524,7 @@ libgd: $(LIBGD_DEPS) $(ARCHIVE)/$(LIBGD_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL)/libgd.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/gdlib.pc
 	$(REMOVE)/$(LIBGD_TMP)
 	$(TOUCH)
@@ -579,7 +576,7 @@ lzo: $(ARCHIVE)/$(LZO_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL)/liblzo$(basename $(LZO_VER)).la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(LZO_TMP)
 	$(TOUCH)
 
@@ -606,7 +603,7 @@ libsigc: $(ARCHIVE)/$(LIBSIGC_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR); \
 		cp sigc++config.h $(TARGET_INCLUDE_DIR)
 	ln -sf ./sigc++-2.0/sigc++ $(TARGET_INCLUDE_DIR)/sigc++
-	$(REWRITE_LIBTOOL)/libsigc-2.0.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/sigc++-2.0.pc
 	$(REMOVE)/$(LIBSIGC_TMP)
 	$(TOUCH)
@@ -640,7 +637,7 @@ expat: $(ARCHIVE)/$(EXPAT_SOURCE) | $(TARGET_DIR)
 		$(MAKE); \
 		make install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF)/expat.pc
-	$(REWRITE_LIBTOOL)/libexpat.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(EXPAT_TMP)
 	$(TOUCH)
 
@@ -685,7 +682,7 @@ libbluray: $(LIBBLURAY_DEPS) $(ARCHIVE)/$(LIBBLURAY_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL)/libbluray.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/libbluray.pc
 	$(REMOVE)/$(LIBBLURAY_TMP)
 	$(TOUCH)
@@ -720,7 +717,7 @@ libass: $(LIBASS_DEPS) $(ARCHIVE)/$(LIBASS_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL)/libass.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/libass.pc
 	$(REMOVE)/$(LIBASS_TMP)
 	$(TOUCH)
@@ -757,7 +754,7 @@ libgpg-error: $(ARCHIVE)/$(LIBGPG-ERROR_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	mv $(TARGET_BIN_DIR)/gpg-error-config $(HOST_DIR)/bin
 	$(REWRITE_CONFIG) $(HOST_DIR)/bin/gpg-error-config
-	$(REWRITE_LIBTOOL)/libgpg-error.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/gpg-error.pc
 	rm -f $(addprefix $(TARGET_BIN_DIR)/,gpg-error gpgrt-config)
 	$(REMOVE)/$(LIBGPG-ERROR_TMP)
@@ -792,7 +789,7 @@ libgcrypt: $(LIBGCRYPT_DEPS) $(ARCHIVE)/$(LIBGCRYPT_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	mv $(TARGET_BIN_DIR)/libgcrypt-config $(HOST_DIR)/bin
 	$(REWRITE_CONFIG) $(HOST_DIR)/bin/libgcrypt-config
-	$(REWRITE_LIBTOOL)/libgcrypt.la
+	$(REWRITE_LIBTOOL_LA)
 	rm -rf $(TARGET_BIN_DIR)/dumpsexp
 	rm -rf $(TARGET_BIN_DIR)/hmac256
 	rm -rf $(TARGET_BIN_DIR)/mpicalc
@@ -826,7 +823,7 @@ libaacs: $(LIBAACS_DEPS) $(ARCHIVE)/$(LIBAACS_SOURCE) | $(TARGET_DIR)
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF)/libaacs.pc
-	$(REWRITE_LIBTOOL)/libaacs.la
+	$(REWRITE_LIBTOOL_LA)
 	$(CD) $(TARGET_DIR); \
 		mkdir -p .config/aacs .cache/aacs/vuk
 	cp $(TARGET_FILES)/libaacs/KEYDB.cfg $(TARGET_DIR)/.config/aacs
@@ -860,7 +857,7 @@ libbdplus: $(LIBBDPLUS_DEPS) $(ARCHIVE)/$(LIBBDPLUS_SOURCE) | $(TARGET_DIR)
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF)/libbdplus.pc
-	$(REWRITE_LIBTOOL)/libbdplus.la
+	$(REWRITE_LIBTOOL_LA)
 	$(CD) $(TARGET_DIR); \
 		mkdir -p .config/bdplus/vm0
 	cp -f $(TARGET_FILES)/libbdplus/* $(TARGET_DIR)/.config/bdplus/vm0
@@ -901,7 +898,7 @@ libxml2: $(ARCHIVE)/$(LIBXML2_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	mv $(TARGET_BIN_DIR)/xml2-config $(HOST_DIR)/bin
 	$(REWRITE_CONFIG) $(HOST_DIR)/bin/xml2-config
-	$(REWRITE_LIBTOOL)/libxml2.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/libxml-2.0.pc
 	rm -rf $(TARGET_LIB_DIR)/xml2Conf.sh
 	rm -rf $(TARGET_LIB_DIR)/cmake
@@ -953,7 +950,7 @@ libroxml: $(ARCHIVE)/$(LIBROXML_SOURCE) | $(TARGET_DIR)
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF)/libroxml.pc
-	$(REWRITE_LIBTOOL)/libroxml.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(LIBROXML_TMP)
 	$(TOUCH)
 
@@ -1007,7 +1004,7 @@ libtirpc: $(ARCHIVE)/$(LIBTIRPC_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL)/libtirpc.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/libtirpc.pc
 	$(REMOVE)/$(LIBTIRPC_TMP)
 	$(TOUCH)
@@ -1101,7 +1098,7 @@ libmad: $(ARCHIVE)/$(LIBMAD_SOURCE) | $(TARGET_DIR)
 		$(MAKE) all; \
 		make install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF)/mad.pc
-	$(REWRITE_LIBTOOL)/libmad.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(LIBMAD_TMP)
 	$(TOUCH)
 
@@ -1129,7 +1126,7 @@ libvorbisidec: $(LIBVORBISIDEC_DEPS) $(ARCHIVE)/$(LIBVORBISIDEC_SOURCE) | $(TARG
 		make all; \
 		make install DESTDIR=$(TARGET_DIR); \
 	$(REWRITE_PKGCONF)/vorbisidec.pc
-	$(REWRITE_LIBTOOL)/libvorbisidec.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(LIBVORBISIDEC_TMP)
 	$(TOUCH)
 
@@ -1155,7 +1152,7 @@ libogg: $(ARCHIVE)/$(LIBOGG_SOURCE) | $(TARGET_DIR)
 		$(MAKE); \
 		make install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF)/ogg.pc
-	$(REWRITE_LIBTOOL)/libogg.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(LIBOGG_TMP)
 	$(TOUCH)
 
@@ -1182,7 +1179,7 @@ fribidi: $(ARCHIVE)/$(FRIBIDI_SOURCE) | $(TARGET_DIR)
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF)/fribidi.pc
-	$(REWRITE_LIBTOOL)/libfribidi.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(FRIBIDI_TMP)
 	$(TOUCH)
 
@@ -1213,7 +1210,7 @@ libffi: $(ARCHIVE)/$(LIBFFI_SOURCE) | $(TARGET_DIR)
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF)/libffi.pc
-	$(REWRITE_LIBTOOL)/libffi.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(LIBFFI_TMP)
 	$(TOUCH)
 
@@ -1280,11 +1277,7 @@ glib2: $(GLIB2_DEPS) $(ARCHIVE)/$(GLIB2_SOURCE) | $(TARGET_DIR)
 	$(REWRITE_PKGCONF)/gmodule-no-export-2.0.pc
 	$(REWRITE_PKGCONF)/gobject-2.0.pc
 	$(REWRITE_PKGCONF)/gthread-2.0.pc
-	$(REWRITE_LIBTOOL)/libgio-2.0.la
-	$(REWRITE_LIBTOOL)/libglib-2.0.la
-	$(REWRITE_LIBTOOL)/libgmodule-2.0.la
-	$(REWRITE_LIBTOOL)/libgobject-2.0.la
-	$(REWRITE_LIBTOOL)/libgthread-2.0.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(GLIB2_TMP)
 	$(TOUCH)
 
@@ -1327,7 +1320,7 @@ alsa-lib: $(ARCHIVE)/$(ALSA-LIB_SOURCE)
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF)/alsa.pc
-	$(REWRITE_LIBTOOL)/libasound.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(ALSA-LIB_TMP)
 	$(TOUCH)
 
@@ -1352,7 +1345,7 @@ popt: $(ARCHIVE)/$(POPT_SOURCE) | $(TARGET_DIR)
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF)/popt.pc
-	$(REWRITE_LIBTOOL)/libpopt.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(POPT_TMP)
 	$(TOUCH)
 
@@ -1381,8 +1374,7 @@ libiconv: $(ARCHIVE)/$(LIBICONV_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL)/libcharset.la
-	$(REWRITE_LIBTOOL)/libiconv.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(LIBICONV_TMP)
 	$(TOUCH)
 
diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk
index 39f87b82..e008e5eb 100644
--- a/make/target-tools-unused.mk
+++ b/make/target-tools-unused.mk
@@ -116,9 +116,7 @@ util-linux: $(UTUL-LINUX_DEPS) $(ARCHIVE)/$(UTIL-LINUX_SOURCE) | $(TARGET_DIR)
 	$(REWRITE_PKGCONF)/fdisk.pc
 	$(REWRITE_PKGCONF)/smartcols.pc
 	$(REWRITE_PKGCONF)/uuid.pc
-	$(REWRITE_LIBTOOL)/libfdisk.la
-	$(REWRITE_LIBTOOL)/libsmartcols.la
-	$(REWRITE_LIBTOOL)/libuuid.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(UTIL-LINUX_TMP)
 	$(TOUCH)
 
diff --git a/make/target-tools.mk b/make/target-tools.mk
index 235bb5f3..9e5a3c98 100644
--- a/make/target-tools.mk
+++ b/make/target-tools.mk
@@ -347,8 +347,7 @@ parted: $(PARTED_DEPS) $(ARCHIVE)/$(PARTED_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL)/libparted.la
-	$(REWRITE_LIBTOOL)/libparted-fs-resize.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REWRITE_PKGCONF)/libparted.pc
 	$(REMOVE)/$(PARTED_TMP)
 	$(TOUCH)
@@ -706,7 +705,7 @@ procps-ng: $(PROCPS-NG_DEPS) $(ARCHIVE)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR)
 		$(INSTALL_EXEC) $(TARGET_DIR)/bin.$(@F)/$$bin $(TARGET_DIR)/bin/$$bin; \
 	done
 	$(REWRITE_PKGCONF)/libprocps.pc
-	$(REWRITE_LIBTOOL)/libprocps.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(PROCPS-NG_TMP) \
 		$(TARGET_DIR)/bin.$(@F) \
 		$(TARGET_DIR)/sbin.$(@F)
@@ -1174,7 +1173,7 @@ sg3_utils: $(ARCHIVE)/$(SG3_UTILS_SOURCE) | $(TARGET_DIR)
 		rm -f $(TARGET_DIR)/bin/$$bin; \
 		$(INSTALL_EXEC) $(TARGET_DIR)/bin.$(@F)/$$bin $(TARGET_DIR)/bin/$$bin; \
 	done
-	$(REWRITE_LIBTOOL)/libsgutils2.la
+	$(REWRITE_LIBTOOL_LA)
 	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/sdX.init $(TARGET_DIR)/etc/init.d/sdX
 	$(UPDATE-RC.D) sdX stop 97 0 6 .
 	$(REMOVE)/$(SG3_UTILS_TMP) \
@@ -1557,7 +1556,7 @@ gettext: $(ARCHIVE)/$(GETTEXT_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL)/libintl.la
+	$(REWRITE_LIBTOOL_LA)
 	$(REMOVE)/$(GETTEXT_TMP)
 	$(TOUCH)