- drop $(REWRITE_LIBTOOLDEP); extending $(REWRITE_LIBTOOL)

make/environment-build.mk

@@ -267,9 +267,9 @@ PKG_CONFIG_LIBDIR = $(TARGET_LIB_DIR)
 PKG_CONFIG_PATH = $(PKG_CONFIG_LIBDIR)/pkgconfig
 
 # helper-"functions":
-REWRITE_LIBTOOL        = sed -i "s,^libdir=.*,libdir='$(TARGET_LIB_DIR)'," $(TARGET_LIB_DIR)
-REWRITE_LIBTOOL_STATIC = sed -i "s,^libdir=.*,libdir='$(TARGET_LIB_DIR)'," $(STATIC_LIB_DIR)
-REWRITE_LIBTOOLDEP     = sed -i -e "s,\(^dependency_libs='\| \|-L\|^dependency_libs='\)/lib,\ $(TARGET_LIB_DIR),g" $(TARGET_LIB_DIR)
+REWRITE_RULES          = sed -i -e "s,^libdir=.*,libdir='$(TARGET_LIB_DIR)'," -e "s,\(^dependency_libs='\| \|-L\|^dependency_libs='\)/lib,\ $(TARGET_LIB_DIR),g"
+REWRITE_LIBTOOL        = $(REWRITE_RULES) $(TARGET_LIB_DIR)
+REWRITE_LIBTOOL_STATIC = $(REWRITE_RULES) $(STATIC_LIB_DIR)
 REWRITE_PKGCONF        = sed -i "s,^prefix=.*,prefix='$(TARGET_DIR)',"
 
 # unpack tarballs, clean up

make/gstreamer.mk

@@ -72,9 +72,6 @@ $(D)/gstreamer: $(D)/libglib2 $(D)/libxml2 $(D)/glib-networking $(ARCHIVE)/$(GST
 	$(REWRITE_LIBTOOL)/libgstbase-1.0.la
 	$(REWRITE_LIBTOOL)/libgstcontroller-1.0.la
 	$(REWRITE_LIBTOOL)/libgstnet-1.0.la
-	$(REWRITE_LIBTOOLDEP)/libgstbase-1.0.la
-	$(REWRITE_LIBTOOLDEP)/libgstcontroller-1.0.la
-	$(REWRITE_LIBTOOLDEP)/libgstnet-1.0.la
 	$(REMOVE)/gstreamer-$(GSTREAMER_VER)
 	$(TOUCH)
 
@@ -136,17 +133,6 @@ $(D)/gst-plugins-base: $(ARCHIVE)/$(GST_PLUGINS_BASE_SOURCE) $(D)/gstreamer $(D)
 	$(REWRITE_LIBTOOL)/libgstsdp-1.0.la
 	$(REWRITE_LIBTOOL)/libgsttag-1.0.la
 	$(REWRITE_LIBTOOL)/libgstvideo-1.0.la
-	$(REWRITE_LIBTOOLDEP)/libgstallocators-1.0.la
-	$(REWRITE_LIBTOOLDEP)/libgstapp-1.0.la
-	$(REWRITE_LIBTOOLDEP)/libgstaudio-1.0.la
-	$(REWRITE_LIBTOOLDEP)/libgstfft-1.0.la
-	$(REWRITE_LIBTOOLDEP)/libgstpbutils-1.0.la
-	$(REWRITE_LIBTOOLDEP)/libgstriff-1.0.la
-	$(REWRITE_LIBTOOLDEP)/libgstrtp-1.0.la
-	$(REWRITE_LIBTOOLDEP)/libgstrtsp-1.0.la
-	$(REWRITE_LIBTOOLDEP)/libgstsdp-1.0.la
-	$(REWRITE_LIBTOOLDEP)/libgsttag-1.0.la
-	$(REWRITE_LIBTOOLDEP)/libgstvideo-1.0.la
 	$(REMOVE)/gst-plugins-base-$(GST_PLUGINS_BASE_VER)
 	$(TOUCH)
 
@@ -242,9 +228,6 @@ $(D)/gst-plugins-bad: $(ARCHIVE)/$(GST_PLUGINS_BAD_SOURCE) $(D)/gst-plugins-base
 	$(REWRITE_LIBTOOL)/libgstplayer-1.0.la
 	$(REWRITE_LIBTOOL)/libgsturidownloader-1.0.la
 	$(REWRITE_LIBTOOL)/libgstwebrtc-1.0.la
-	$(REWRITE_LIBTOOLDEP)/libgstbadaudio-1.0.la
-	$(REWRITE_LIBTOOLDEP)/libgstadaptivedemux-1.0.la
-	$(REWRITE_LIBTOOLDEP)/libgstbadvideo-1.0.la
 	$(REMOVE)/gst-plugins-bad-$(GST_PLUGINS_BAD_VER)
 	$(TOUCH)
 
@@ -451,7 +434,6 @@ $(D)/orc: $(ARCHIVE)/$(ORC_SOURCE)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/orc-0.4.pc
 	$(REWRITE_LIBTOOL)/liborc-0.4.la
 	$(REWRITE_LIBTOOL)/liborc-test-0.4.la
-	$(REWRITE_LIBTOOLDEP)/liborc-test-0.4.la
 	rm -f $(addprefix $(TARGET_DIR)/bin/,orc-bugreport orcc)
 	$(REMOVE)/orc-$(ORC_VER)
 	$(TOUCH)
@@ -560,7 +542,6 @@ $(D)/gnutls: $(D)/nettle $(D)/ca-bundle $(ARCHIVE)/$(GNUTLS_SOURCE)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/gnutls.pc
 	$(REWRITE_LIBTOOL)/libgnutls.la
 	$(REWRITE_LIBTOOL)/libgnutlsxx.la
-	$(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)

make/system-libs.mk

@@ -1132,11 +1132,6 @@ $(D)/libglib2: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(LIBGLIB2_DEPS) $(D
 	$(REWRITE_LIBTOOL)/libgmodule-2.0.la
 	$(REWRITE_LIBTOOL)/libgobject-2.0.la
 	$(REWRITE_LIBTOOL)/libgthread-2.0.la
-	$(REWRITE_LIBTOOLDEP)/libgio-2.0.la
-	$(REWRITE_LIBTOOLDEP)/libglib-2.0.la
-	$(REWRITE_LIBTOOLDEP)/libgmodule-2.0.la
-	$(REWRITE_LIBTOOLDEP)/libgobject-2.0.la
-	$(REWRITE_LIBTOOLDEP)/libgthread-2.0.la
 	$(REMOVE)/glib-$(GLIB_VER)
 	$(TOUCH)