[openwrt/openwrt] tools/libtool: clean up build recipes

LEDE Commits lede-commits at lists.infradead.org
Sun Mar 26 15:42:19 PDT 2023


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/7c0727c26330d12253ec98463279a564ae0f9efa

commit 7c0727c26330d12253ec98463279a564ae0f9efa
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Wed Mar 15 01:45:02 2023 -0400

    tools/libtool: clean up build recipes
    
    Host/Clean/Default is no longer defined.
    
    Use the uninstall makefile target
    to remove the obsolete m4 files, and more.
    
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
---
 tools/libtool/Makefile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tools/libtool/Makefile b/tools/libtool/Makefile
index cc9e8a68fb..b4f3ecc36b 100644
--- a/tools/libtool/Makefile
+++ b/tools/libtool/Makefile
@@ -23,7 +23,7 @@ HOST_CONFIGURE_VARS += \
 
 define Host/Prepare
 	$(call Host/Prepare/Default)
-	(cd $(STAGING_DIR_HOST)/share/aclocal/ && rm -f libtool.m4 ltdl.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4)
+	$(call Host/Uninstall)
 	$(if $(QUILT),,(cd $(HOST_BUILD_DIR); touch README-release; $(AM_TOOL_PATHS) ./bootstrap --skip-git --skip-po --force))
 endef
 
@@ -33,16 +33,13 @@ define Host/Configure
 endef
 
 define Host/Install
-	$(MAKE) -C $(HOST_BUILD_DIR) install
+	$(call Host/Compile/Default,install)
 	$(SED) 's,\(hardcode_into_libs\)=yes,\1=no,g' $(STAGING_DIR_HOST)/bin/libtool
 endef
 
 define Host/Uninstall
 	-$(call Host/Compile/Default,uninstall)
-endef
-
-define Host/Clean
-	$(call Host/Clean/Default)
+	(cd $(STAGING_DIR_HOST)/share/aclocal/ && rm -f libtool.m4 ltdl.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4)
 endef
 
 $(eval $(call HostBuild))




More information about the lede-commits mailing list