From 90318fb26f02b6a99301a051a565bd156e554f78 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 21 Mar 2021 21:42:07 +0100 Subject: [PATCH] - unify TARGET_CLEANUP calls --- make/target-blobs.mk | 2 +- make/target-development.mk | 8 +++---- make/target-libs-unused.mk | 10 ++++----- make/target-libs.mk | 20 ++++++++--------- make/target-lua.mk | 2 +- make/target-tools-unused.mk | 12 +++++----- make/target-tools.mk | 31 ++++++++++---------------- package/alsa-lib/alsa-lib.mk | 6 ++--- package/bash/bash.mk | 4 ++-- package/f2fs-tools/f2fs-tools.mk | 2 +- package/libfuse/libfuse.mk | 4 ++-- package/libgcrypt/libgcrypt.mk | 2 +- package/libjpeg-turbo/libjpeg-turbo.mk | 2 +- package/libpng/libpng.mk | 2 +- package/libxml2/libxml2.mk | 3 +-- package/libxslt/libxslt.mk | 3 +-- package/mc/mc.mk | 4 ++-- package/nfs-utils/nfs-utils.mk | 4 ++-- package/ntfs-3g/ntfs-3g.mk | 4 ++-- package/rpcbind/rpcbind.mk | 2 +- package/sdl2/sdl2.mk | 6 ++++- 21 files changed, 64 insertions(+), 69 deletions(-) diff --git a/make/target-blobs.mk b/make/target-blobs.mk index 571c3be3..3daf25dd 100644 --- a/make/target-blobs.mk +++ b/make/target-blobs.mk @@ -170,7 +170,7 @@ hd60-drivers \ hd61-drivers: $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) | $(TARGET_DIR) $(INSTALL) -d $(TARGET_modulesdir)/extra unzip -o $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) -d $(TARGET_modulesdir)/extra - rm -f $(TARGET_modulesdir)/extra/hi_play.ko + $(TARGET_RM) $(TARGET_modulesdir)/extra/hi_play.ko mv $(TARGET_modulesdir)/extra/turnoff_power $(TARGET_bindir) $(LINUX_RUN_DEPMOD) $(TOUCH) diff --git a/make/target-development.mk b/make/target-development.mk index 0a9cb8c8..f7b23fce 100644 --- a/make/target-development.mk +++ b/make/target-development.mk @@ -27,8 +27,8 @@ valgrind: $(DL_DIR)/$(VALGRIND_SOURCE) | $(TARGET_DIR) $(CONFIGURE); \ $(MAKE); \ make install DESTDIR=$(TARGET_DIR) - -rm $(addprefix $(TARGET_libdir)/valgrind/,*.a *.xml) - -rm $(addprefix $(TARGET_bindir)/,cg_* callgrind_* ms_print) + $(TARGET_RM) $(addprefix $(TARGET_libdir)/valgrind/,*.a *.xml) + $(TARGET_RM) $(addprefix $(TARGET_bindir)/,cg_* callgrind_* ms_print) $(REMOVE)/$(PKG_DIR) $(TOUCH) @@ -49,7 +49,7 @@ strace: $(DL_DIR)/$(STRACE_SOURCE) | $(TARGET_DIR) $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - -rm $(addprefix $(TARGET_bindir)/,strace-graph strace-log-merge) + $(TARGET_RM) $(addprefix $(TARGET_bindir)/,strace-graph strace-log-merge) $(REMOVE)/$(STRACE_DIR) $(TOUCH) @@ -87,7 +87,7 @@ gdb: $(GDB_DEPENDENCIES) $(DL_DIR)/$(GDB_SOURCE) | $(TARGET_DIR) $(CONFIGURE); \ $(MAKE) all-gdb; \ $(MAKE) install-gdb DESTDIR=$(TARGET_DIR) - -rm $(addprefix $(TARGET_datadir)/,system-gdbinit) + $(TARGET_RM) $(addprefix $(TARGET_datadir)/,system-gdbinit) find $(TARGET_datadir)/gdb/syscalls -type f -not -name 'arm-linux.xml' -not -name 'gdb-syscalls.dtd' -print0 | xargs -0 rm -- $(REMOVE)/$(GDB_DIR) $(TOUCH) diff --git a/make/target-libs-unused.mk b/make/target-libs-unused.mk index 40c599e6..278d2136 100644 --- a/make/target-libs-unused.mk +++ b/make/target-libs-unused.mk @@ -123,11 +123,11 @@ cairo: $(CAIRO_DEPENDENCIES) $(DL_DIR)/$(CAIRO_SOURCE) | $(TARGET_DIR) $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - rm -rf $(TARGET_bindir)/cairo-sphinx - rm -rf $(TARGET_libdir)/cairo/cairo-fdr* - rm -rf $(TARGET_libdir)/cairo/cairo-sphinx* - rm -rf $(TARGET_libdir)/cairo/.debug/cairo-fdr* - rm -rf $(TARGET_libdir)/cairo/.debug/cairo-sphinx* + $(TARGET_RM) $(TARGET_bindir)/cairo-sphinx + $(TARGET_RM) $(TARGET_libdir)/cairo/cairo-fdr* + $(TARGET_RM) $(TARGET_libdir)/cairo/cairo-sphinx* + $(TARGET_RM) $(TARGET_libdir)/cairo/.debug/cairo-fdr* + $(TARGET_RM) $(TARGET_libdir)/cairo/.debug/cairo-sphinx* $(REWRITE_LIBTOOL) $(REMOVE)/$(PKG_DIR) $(TOUCH) diff --git a/make/target-libs.mk b/make/target-libs.mk index 23e7761c..2953f4de 100644 --- a/make/target-libs.mk +++ b/make/target-libs.mk @@ -147,12 +147,12 @@ openssl: $(DL_DIR)/$(OPENSSL_SOURCE) | $(TARGET_DIR) $(MAKE) depend; \ $(MAKE); \ $(MAKE) install_sw INSTALL_PREFIX=$(TARGET_DIR) - rm -rf $(TARGET_libdir)/engines - rm -f $(TARGET_bindir)/c_rehash - rm -f $(TARGET_sysconfdir)/ssl/misc/{CA.pl,tsget} + $(TARGET_RM) $(TARGET_libdir)/engines + $(TARGET_RM) $(TARGET_bindir)/c_rehash + $(TARGET_RM) $(TARGET_sysconfdir)/ssl/misc/{CA.pl,tsget} ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) - rm -f $(TARGET_bindir)/openssl - rm -f $(TARGET_sysconfdir)/ssl/misc/{CA.*,c_*} + $(TARGET_RM) $(TARGET_bindir)/openssl + $(TARGET_RM) $(TARGET_sysconfdir)/ssl/misc/{CA.*,c_*} endif chmod 0755 $(TARGET_libdir)/lib{crypto,ssl}.so.* for version in 0.9.7 0.9.8 1.0.2; do \ @@ -197,8 +197,8 @@ ncurses: $(DL_DIR)/$(NCURSES_SOURCE) | $(TARGET_DIR) $(CONFIGURE); \ $(MAKE) libs; \ $(MAKE) install.libs DESTDIR=$(TARGET_DIR) - -rm $(addprefix $(TARGET_libdir)/,libform* libmenu* libpanel*) - -rm $(addprefix $(TARGET_libdir)/pkgconfig/,form.pc menu.pc panel.pc) + $(TARGET_RM) $(addprefix $(TARGET_libdir)/,libform* libmenu* libpanel*) + $(TARGET_RM) $(addprefix $(TARGET_libdir)/pkgconfig/,form.pc menu.pc panel.pc) $(REWRITE_CONFIG_SCRIPTS) $(REMOVE)/$(PKG_DIR) $(TOUCH) @@ -350,7 +350,7 @@ libgpg-error: $(DL_DIR)/$(LIBGPG_ERROR_SOURCE) | $(TARGET_DIR) $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - -rm $(addprefix $(TARGET_bindir)/,gpg-error gpgrt-config) + $(TARGET_RM) $(addprefix $(TARGET_bindir)/,gpg-error gpgrt-config) $(REWRITE_CONFIG_SCRIPTS) $(REWRITE_LIBTOOL) $(REMOVE)/$(PKG_DIR) @@ -435,7 +435,7 @@ rtmpdump: $(RTMPDUMP_DEPENDENCIES) $(SOURCE_DIR)/$(NI_RTMPDUMP) | $(TARGET_DIR) $(CHDIR)/$(NI_RTMPDUMP); \ $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS); \ $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) - -rm $(addprefix $(TARGET_sbindir)/,rtmpgw rtmpsrv rtmpsuck) + $(TARGET_RM) $(addprefix $(TARGET_sbindir)/,rtmpgw rtmpsrv rtmpsuck) $(REMOVE)/$(NI_RTMPDUMP) $(TOUCH) @@ -577,6 +577,6 @@ graphlcd-base: $(GRAPHLCD_BASE_DEPENDENCIES) | $(TARGET_DIR) $(TARGET_CONFIGURE_ENV) \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) PREFIX=$(prefix) - -rm -r $(TARGET_sysconfdir)/udev + $(TARGET_RM) $(TARGET_sysconfdir)/udev $(REMOVE)/$(PKG_DIR) $(TOUCH) diff --git a/make/target-lua.mk b/make/target-lua.mk index 4b47c3be..d8a5df5f 100644 --- a/make/target-lua.mk +++ b/make/target-lua.mk @@ -27,7 +27,7 @@ lua: $(LUA_DEPENDENCIES) $(DL_DIR)/$(LUA_SOURCE) | $(TARGET_DIR) ; \ $(MAKE) install INSTALL_TOP=$(TARGET_prefix) INSTALL_MAN=$(TARGET_DIR)$(REMOVE_man1dir); \ $(MAKE) pc INSTALL_TOP=$(TARGET_prefix) > $(TARGET_libdir)/pkgconfig/lua.pc - rm -rf $(TARGET_bindir)/luac + $(TARGET_RM) $(TARGET_bindir)/luac $(REMOVE)/$(LUA_DIR) $(TOUCH) diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk index 7e56c611..df8988d7 100644 --- a/make/target-tools-unused.mk +++ b/make/target-tools-unused.mk @@ -22,11 +22,11 @@ usbutils: $(USBUTILS_DEPENDENCIES) $(DL_DIR)/$(USBUTILS_SOURCE) | $(TARGET_DIR) $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - rm -rf $(TARGET_bindir)/lsusb.py - rm -rf $(TARGET_bindir)/usbhid-dump - rm -rf $(TARGET_sbindir)/update-usbids.sh - rm -rf $(TARGET_datadir)/pkgconfig - rm -rf $(TARGET_datadir)/usb.ids.gz + $(TARGET_RM) $(TARGET_bindir)/lsusb.py + $(TARGET_RM) $(TARGET_bindir)/usbhid-dump + $(TARGET_RM) $(TARGET_sbindir)/update-usbids.sh + $(TARGET_RM) $(TARGET_datadir)/pkgconfig + $(TARGET_RM) $(TARGET_datadir)/usb.ids.gz $(REMOVE)/$(PKG_DIR) $(TOUCH) @@ -130,7 +130,7 @@ bzip2: $(DL_DIR)/$(BZIP2_SOURCE) | $(TARGET_DIR) $(TARGET_CONFIGURE_ENV) \ $(MAKE); \ $(MAKE) install PREFIX=$(TARGET_prefix) - rm -f $(TARGET_bindir)/bzip2 + $(TARGET_RM) $(TARGET_bindir)/bzip2 $(REMOVE)/$(PKG_DIR) $(TOUCH) diff --git a/make/target-tools.mk b/make/target-tools.mk index ce26001c..edbd78b1 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -201,8 +201,8 @@ sysvinit: $(DL_DIR)/$(SYSVINIT_SOURCE) | $(TARGET_DIR) $(TARGET_CONFIGURE_ENV) \ $(MAKE) -C src SULOGINLIBS=-lcrypt; \ $(MAKE) install ROOT=$(TARGET_DIR) MANDIR=$(REMOVE_mandir) - -rm $(addprefix $(TARGET_base_sbindir)/,bootlogd fstab-decode logsave telinit) - -rm $(addprefix $(TARGET_bindir)/,last lastb mesg readbootlog utmpdump wall) + $(TARGET_RM) $(addprefix $(TARGET_base_sbindir)/,bootlogd fstab-decode logsave telinit) + $(TARGET_RM) $(addprefix $(TARGET_bindir)/,last lastb mesg readbootlog utmpdump wall) $($(PKG)_INSTALL_FILES) $(REMOVE)/$(PKG_DIR) $(TOUCH) @@ -241,7 +241,7 @@ xfsprogs: $(XFSPROGS_DEPENDENCIES) $(DL_DIR)/$(XFSPROGS_SOURCE) | $(TARGET_DIR) $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DIST_ROOT=$(TARGET_DIR) - -rm -r $(addprefix $(TARGET_libdir)/,xfsprogs) + $(TARGET_RM) $(addprefix $(TARGET_libdir)/,xfsprogs) $(REMOVE)/$(PKG_DIR) $(TOUCH) @@ -303,9 +303,9 @@ e2fsprogs: $(E2FSPROGS_DEPENDENCIES) $(DL_DIR)/$(E2FSPROGS_SOURCE) | $(TARGET_DI $(CONFIGURE); \ $(MAKE); \ $(MAKE1) install install-libs DESTDIR=$(TARGET_DIR) - -rm $(addprefix $(TARGET_base_sbindir)/,dumpe2fs e2mmpstatus e2undo logsave) - -rm $(addprefix $(TARGET_bindir)/,chattr compile_et lsattr mk_cmds uuidgen) - -rm $(addprefix $(TARGET_sbindir)/,e2freefrag e4crypt filefrag) + $(TARGET_RM) $(addprefix $(TARGET_base_sbindir)/,dumpe2fs e2mmpstatus e2undo logsave) + $(TARGET_RM) $(addprefix $(TARGET_bindir)/,chattr compile_et lsattr mk_cmds uuidgen) + $(TARGET_RM) $(addprefix $(TARGET_sbindir)/,e2freefrag e4crypt filefrag) $(REMOVE)/$(PKG_DIR) $(TOUCH) @@ -467,9 +467,9 @@ ntp: $(NTP_DEPENDENCIES) $(DL_DIR)/$(NTP_SOURCE) | $(TARGET_DIR) $(APPLY_PATCHES); \ $(CONFIGURE); \ $(MAKE); \ - $(INSTALL_EXEC) -D ntpdate/ntpdate $(TARGET_sbindir)/ntpdate + $(MAKE) install DESTDIR=$(TARGET_DIR)/ntp $(INSTALL_EXEC) -D $(PKG_FILES_DIR)/ntpdate.init $(TARGET_sysconfdir)/init.d/ntpdate - $(REMOVE)/$(PKG_DIR) + #$(REMOVE)/$(PKG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -554,6 +554,7 @@ smartmontools: $(DL_DIR)/$(SMARTMONTOOLS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) $(UNTAR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ + $(APPLY_PATCHES); \ $(CONFIGURE); \ $(MAKE); \ $(INSTALL_EXEC) -D smartctl $(TARGET_sbindir)/smartctl @@ -777,11 +778,7 @@ samba33: $(SAMBA33_DEPENDENCIES) $(DL_DIR)/$(SAMBA33_SOURCE) | $(TARGET_DIR) $(INSTALL_DATA) -D $(PKG_FILES_DIR)/smb3.conf $(TARGET_sysconfdir)/samba/smb.conf $(INSTALL_EXEC) -D $(PKG_FILES_DIR)/samba3.init $(TARGET_sysconfdir)/init.d/samba $(UPDATE-RC.D) samba defaults 75 25 - rm -rf $(TARGET_bindir)/testparm - rm -rf $(TARGET_bindir)/findsmb - rm -rf $(TARGET_bindir)/smbtar - rm -rf $(TARGET_bindir)/smbclient - rm -rf $(TARGET_bindir)/smbpasswd + $(TARGET_RM) $(addprefix $(TARGET_bindir)/,testparm findsmb smbtar smbclient smbpasswd) $(REMOVE)/$(PKG_DIR) $(TOUCH) @@ -847,11 +844,7 @@ samba36: $(SAMBA36_DEPENDENCIES) $(DL_DIR)/$(SAMBA36_SOURCE) | $(TARGET_DIR) $(INSTALL_DATA) -D $(PKG_FILES_DIR)/smb3.conf $(TARGET_sysconfdir)/samba/smb.conf $(INSTALL_EXEC) -D $(PKG_FILES_DIR)/samba3.init $(TARGET_sysconfdir)/init.d/samba $(UPDATE-RC.D) samba defaults 75 25 - rm -rf $(TARGET_bindir)/testparm - rm -rf $(TARGET_bindir)/findsmb - rm -rf $(TARGET_bindir)/smbtar - rm -rf $(TARGET_bindir)/smbclient - rm -rf $(TARGET_bindir)/smbpasswd + $(TARGET_RM) $(addprefix $(TARGET_bindir)/,testparm findsmb smbtar smbclient smbpasswd) $(REMOVE)/$(PKG_DIR) $(TOUCH) @@ -1029,7 +1022,7 @@ xupnpd: $(XUPNPD_DEPENDENCIES) | $(TARGET_DIR) $(INSTALL_EXEC) -D src/xupnpd $(TARGET_bindir)/xupnpd; \ $(INSTALL) -d $(TARGET_datadir)/xupnpd/config; \ $(INSTALL_COPY) src/{plugins,profiles,ui,www,*.lua} $(TARGET_datadir)/xupnpd/ - rm $(TARGET_datadir)/xupnpd/plugins/staff/xupnpd_18plus.lua + $(TARGET_RM) $(TARGET_datadir)/xupnpd/plugins/staff/xupnpd_18plus.lua $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-lua/xupnpd/xupnpd_18plus.lua $(TARGET_datadir)/xupnpd/plugins/ $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-lua/xupnpd/xupnpd_cczwei.lua $(TARGET_datadir)/xupnpd/plugins/ $(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-lua/xupnpd/xupnpd_neutrino.lua $(TARGET_datadir)/xupnpd/plugins/ diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index 5fadbd0e..3ddb8a5e 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -29,9 +29,9 @@ ALSA_LIB_CONF_OPTS = \ --disable-topology define ALSA_LIB_TARGET_CLEANUP - find $(TARGET_datadir)/alsa/cards/ -name '*.conf' ! -name 'aliases.conf' | xargs --no-run-if-empty rm - find $(TARGET_datadir)/alsa/pcm/ -name '*.conf' ! -name 'default.conf' ! -name 'dmix.conf' ! -name 'dsnoop.conf' | xargs --no-run-if-empty rm - -rm -r $(TARGET_datadir)/aclocal + find $(TARGET_datadir)/alsa/cards/ -name '*.conf' ! -name 'aliases.conf' | xargs --no-run-if-empty $(TARGET_RM) + find $(TARGET_datadir)/alsa/pcm/ -name '*.conf' ! -name 'default.conf' ! -name 'dmix.conf' ! -name 'dsnoop.conf' | xargs --no-run-if-empty $(TARGET_RM) + $(TARGET_RM) $(TARGET_datadir)/aclocal endef ALSA_LIB_TARGET_FINALIZE_HOOKS += ALSA_LIB_TARGET_CLEANUP diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 96e0d5e3..4528c41e 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -22,8 +22,8 @@ BASH_CONF_OPTS = \ --without-bash-malloc define BASH_TARGET_CLEANUP - -rm $(addprefix $(TARGET_libdir)/bash/, loadables.h Makefile.inc) - -rm -f $(addprefix $(TARGET_base_bindir)/, bashbug) + $(TARGET_RM) $(addprefix $(TARGET_libdir)/bash/, loadables.h Makefile.inc) + $(TARGET_RM) $(addprefix $(TARGET_base_bindir)/, bashbug) endef BASH_TARGET_FINALIZE_HOOKS += BASH_TARGET_CLEANUP diff --git a/package/f2fs-tools/f2fs-tools.mk b/package/f2fs-tools/f2fs-tools.mk index 721f4b63..5396d0f5 100644 --- a/package/f2fs-tools/f2fs-tools.mk +++ b/package/f2fs-tools/f2fs-tools.mk @@ -24,7 +24,7 @@ F2FS_TOOLS_CONF_OPTS = \ --without-selinux define F2FS_TOOLS_TARGET_CLEANUP - -rm $(addprefix $(TARGET_base_sbindir)/,sg_write_buffer) + $(TARGET_RM) $(addprefix $(TARGET_base_sbindir)/,sg_write_buffer) endef F2FS_TOOLS_TARGET_FINALIZE_HOOKS += F2FS_TOOLS_TARGET_CLEANUP diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk index 7847e84e..ab37293e 100644 --- a/package/libfuse/libfuse.mk +++ b/package/libfuse/libfuse.mk @@ -19,8 +19,8 @@ LIBFUSE_CONF_OPTS = \ --enable-lib define LIBFUSE_TARGET_CLEANUP - -rm -r $(TARGET_sysconfdir)/udev - -rm $(TARGET_sysconfdir)/init.d/fuse + $(TARGET_RM) $(TARGET_sysconfdir)/udev + $(TARGET_RM) $(TARGET_sysconfdir)/init.d/fuse endef LIBFUSE_TARGET_FINALIZE_HOOKS += LIBFUSE_TARGET_CLEANUP diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 5f04d26e..7f1edbd3 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -20,7 +20,7 @@ LIBGCRYPT_CONF_OPTS = \ --disable-tests define LIBGCRYPT_TARGET_CLEANUP - -rm $(addprefix $(TARGET_bindir)/,dumpsexp hmac256 mpicalc) + $(TARGET_RM) $(addprefix $(TARGET_bindir)/,dumpsexp hmac256 mpicalc) endef LIBGCRYPT_TARGET_FINALIZE_HOOKS += LIBGCRYPT_TARGET_CLEANUP diff --git a/package/libjpeg-turbo/libjpeg-turbo.mk b/package/libjpeg-turbo/libjpeg-turbo.mk index 307fdcaa..1a657287 100644 --- a/package/libjpeg-turbo/libjpeg-turbo.mk +++ b/package/libjpeg-turbo/libjpeg-turbo.mk @@ -17,7 +17,7 @@ LIBJPEG_TURBO_CONF_OPTS = \ -DWITH_JPEG8=80 define LIBJPEG_TURBO_TARGET_CLEANUP - -rm $(addprefix $(TARGET_bindir)/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom) + $(TARGET_RM) $(addprefix $(TARGET_bindir)/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom) endef LIBJPEG_TURBO_TARGET_FINALIZE_HOOKS += LIBJPEG_TURBO_TARGET_CLEANUP diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index f00b36d9..a98ab3d2 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -18,7 +18,7 @@ LIBPNG_CONF_OPTS = \ $(if $(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse),--enable-arm-neon,--disable-arm-neon) define LIBPNG_TARGET_CLEANUP - -rm $(addprefix $(TARGET_bindir)/,libpng-config) + $(TARGET_RM) $(addprefix $(TARGET_bindir)/,libpng-config) endef LIBPNG_TARGET_FINALIZE_HOOKS += LIBPNG_TARGET_CLEANUP diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 31c9a098..201ecd1f 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -26,8 +26,7 @@ LIBXML2_CONF_OPTS = \ --without-schematron define LIBXML2_TARGET_CLEANUP - -rm -r $(TARGET_libdir)/cmake - -rm $(addprefix $(TARGET_libdir)/,xml2Conf.sh) + $(TARGET_RM) $(addprefix $(TARGET_libdir)/,cmake xml2Conf.sh) endef LIBXML2_TARGET_FINALIZE_HOOKS += LIBXML2_TARGET_CLEANUP diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index 9bf83d2e..0d5f25a4 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -23,8 +23,7 @@ LIBXSLT_CONF_OPTS = \ --without-mem-debug define LIBXSLT_TARGET_CLEANUP - -rm -r $(TARGET_libdir)/libxslt-plugins/ - -rm $(addprefix $(TARGET_libdir)/,xsltConf.sh) + $(TARGET_RM) $(addprefix $(TARGET_libdir)/,libxslt-plugins xsltConf.sh) endef LIBXSLT_TARGET_FINALIZE_HOOKS += LIBXSLT_TARGET_CLEANUP diff --git a/package/mc/mc.mk b/package/mc/mc.mk index 9e1ddcd7..d3f1adac 100644 --- a/package/mc/mc.mk +++ b/package/mc/mc.mk @@ -26,8 +26,8 @@ MC_CONF_OPTS = \ --without-x define MC_TARGET_CLEANUP - -rm -r $(TARGET_datadir)/mc/examples - find $(TARGET_datadir)/mc/skins -type f ! -name default.ini | xargs --no-run-if-empty rm + $(TARGET_RM) $(TARGET_datadir)/mc/examples + find $(TARGET_datadir)/mc/skins -type f ! -name default.ini | xargs --no-run-if-empty $(TARGET_RM) endef MC_TARGET_FINALIZE_HOOKS += MC_TARGET_CLEANUP diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 765fb9ec..2489dc9d 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -30,8 +30,8 @@ NFS_UTILS_CONF_OPTS = \ define NFS_UTILS_TARGET_CLEANUP chmod 0755 $(TARGET_base_sbindir)/mount.nfs - rm -f $(addprefix $(TARGET_base_sbindir)/,mount.nfs4 osd_login umount.nfs umount.nfs4) - rm -f $(addprefix $(TARGET_sbindir)/,mountstats nfsiostat) + $(TARGET_RM) $(addprefix $(TARGET_base_sbindir)/,mount.nfs4 osd_login umount.nfs umount.nfs4) + $(TARGET_RM) $(addprefix $(TARGET_sbindir)/,mountstats nfsiostat) endef NFS_UTILS_TARGET_FINALIZE_HOOKS += NFS_UTILS_TARGET_CLEANUP diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk index 18332a97..f54c97ef 100644 --- a/package/ntfs-3g/ntfs-3g.mk +++ b/package/ntfs-3g/ntfs-3g.mk @@ -23,8 +23,8 @@ NTFS_3G_CONF_OPTS = \ --with-fuse=external define NTFS_3G_TARGET_CLEANUP - -rm $(addprefix $(TARGET_base_bindir)/,lowntfs-3g ntfs-3g.probe) - -rm $(addprefix $(TARGET_base_sbindir)/,mount.lowntfs-3g) + $(TARGET_RM) $(addprefix $(TARGET_base_bindir)/,lowntfs-3g ntfs-3g.probe) + $(TARGET_RM) $(addprefix $(TARGET_base_sbindir)/,mount.lowntfs-3g) endef NTFS_3G_TARGET_FINALIZE_HOOKS += NTFS_3G_TARGET_CLEANUP diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk index caba3a19..6b33c46e 100644 --- a/package/rpcbind/rpcbind.mk +++ b/package/rpcbind/rpcbind.mk @@ -18,7 +18,7 @@ RPCBIND_CONF_OPTS = \ --with-systemdsystemunitdir=no define RPCBIND_TARGET_CLEANUP - -rm $(TARGET_bindir)/rpcgen + $(TARGET_RM) $(TARGET_bindir)/rpcgen endef RPCBIND_TARGET_FINALIZE_HOOKS += RPCBIND_TARGET_CLEANUP diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index be58ae06..10b36ed6 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -34,6 +34,10 @@ SDL2_CONF_OPTS += \ --enable-video-opengles \ --without-x +define SDL2_TARGET_CLEANUP + $(TARGET_RM) $(TARGET_libdir)/cmake +endef +SDL2_TARGET_FINALIZE_HOOKS += SDL2_TARGET_CLEANUP + sdl2: | $(TARGET_DIR) $(call autotools-package) - -rm -r $(TARGET_libdir)/cmake