diff options
| -rw-r--r-- | mk/binutils.mk | 6 | ||||
| -rw-r--r-- | mk/eglibc.mk | 12 | ||||
| -rw-r--r-- | mk/gcc.mk | 19 | ||||
| -rw-r--r-- | mk/gmp.mk | 6 | ||||
| -rw-r--r-- | mk/gperf_host.mk | 6 | ||||
| -rw-r--r-- | mk/linux.mk | 10 | ||||
| -rw-r--r-- | mk/mpc.mk | 6 | ||||
| -rw-r--r-- | mk/mpfr.mk | 6 | ||||
| -rwxr-xr-x | mk/uclibc.mk | 8 | ||||
| -rw-r--r-- | mk/zlib_host.mk | 6 | ||||
| -rw-r--r-- | packages/development/gdb/gdb.mk | 14 |
11 files changed, 83 insertions, 16 deletions
diff --git a/mk/binutils.mk b/mk/binutils.mk index 7c0f43f..79baa07 100644 --- a/mk/binutils.mk +++ b/mk/binutils.mk @@ -39,5 +39,9 @@ BINUTILS_PREFIX := $(embtk_tools) binutils_install: $(call embtk_install_hostpkg,binutils) +define embtk_cleanup_binutils + rm -rf $(BINUTILS_BUILD_DIR) +endef + binutils_clean: - $(Q)rm -rf $(BINUTILS_BUILD_DIR) + $(Q)$(embtk_cleanup_binutils) diff --git a/mk/eglibc.mk b/mk/eglibc.mk index ff0125c..8f95d7e 100644 --- a/mk/eglibc.mk +++ b/mk/eglibc.mk @@ -81,11 +81,19 @@ eglibc_install: # # clean targets # +define embtk_cleanup_eglibc + rm -rf $(EGLIBC_BUILD_DIR) +endef + +define embtk_cleanup_eglibc_headers + rm -rf $(EGLIBC_HEADERS_BUILD_DIR) +endef + eglibc_clean: - $(Q)rm -rf $(EGLIBC_BUILD_DIR) + $(Q)$(embtk_cleanup_eglibc) eglibc_headers_clean: - $(Q)rm -rf $(EGLIBC_HEADERS_BUILD_DIR) + $(Q)$(embtk_cleanup_eglibc_headers) # # download and macros @@ -59,8 +59,6 @@ endif gcc%_install: $(call embtk_install_hostpkg,$(patsubst %_install,%,$@)) -gcc%_clean: - $(Q)rm -rf $(GCC$*_BUILD_DIR) # # GCC first stage # @@ -163,3 +161,20 @@ ifeq ($(CONFIG_EMBTK_64BITS_FS)$(CONFIG_EMBTK_CLIB_UCLIBC),yy) endif $(Q)touch $@ +# +# clean up macros and targets +# +define embtk_cleanup_gcc1 + rm -rf $(GCC1_BUILD_DIR) +endef + +define embtk_cleanup_gcc2 + rm -rf $(GCC2_BUILD_DIR) +endef + +define embtk_cleanup_gcc3 + rm -rf $(GCC3_BUILD_DIR) +endef + +gcc%_clean: + $(Q)$(embtk_cleanup_gcc$*) @@ -36,5 +36,9 @@ export GMP_HOST_DIR GMP_HOST_CONFIGURE_OPTS := --disable-shared --enable-static GMP_HOST_PREFIX := $(GMP_HOST_DIR) +define embtk_cleanup_gmp_host + rm -rf $(GMP_HOST_BUILD_DIR) +endef + gmp_host_clean: - $(Q)rm -rf $(GMP_HOST_BUILD_DIR) + $(Q)$(embtk_cleanup_gmp_host) diff --git a/mk/gperf_host.mk b/mk/gperf_host.mk index 954aef3..e901439 100644 --- a/mk/gperf_host.mk +++ b/mk/gperf_host.mk @@ -30,5 +30,9 @@ GPERF_HOST_PACKAGE := gperf-$(GPERF_HOST_VERSION).tar.gz GPERF_HOST_SRC_DIR := $(embtk_toolsb)/gperf-$(GPERF_HOST_VERSION) GPERF_HOST_BUILD_DIR := $(embtk_toolsb)/gperf-$(GPERF_HOST_VERSION) +define embtk_cleanup_gperf_host + rm -rf $(GPERF_HOST_BUILD_DIR) +endef + gperf_host_clean: - $(Q)rm -rf $(GPERF_HOST_BUILD_DIR) + $(Q)$(embtk_cleanup_gperf_host) diff --git a/mk/linux.mk b/mk/linux.mk index 33edaa4..9138b38 100644 --- a/mk/linux.mk +++ b/mk/linux.mk @@ -61,14 +61,18 @@ download_linux download_linux_headers: $(call embtk_download_pkg,linux) # -# clean target +# clean target and macros # -define embtk_linux_clean +define embtk_cleanup_linux if [ -d $(LINUX_BUILD_DIR) ]; then \ $(MAKE) -C $(LINUX_BUILD_DIR) distclean; \ rm -rf $(LINUX_BUILD_DIR)/.headers_installed; \ fi endef +define embtk_cleanup_linux_headers + $(embtk_cleanup_linux) +endef + linux_clean linux_headers_clean: - $(embtk_linux_clean) + $(embtk_cleanup_linux) @@ -38,5 +38,9 @@ MPC_HOST_CONFIGURE_OPTS := --disable-shared --enable-static \ --with-mpfr=$(MPFR_HOST_DIR) MPC_HOST_PREFIX := $(MPC_HOST_DIR) +define embtk_cleanup_mpc_host + rm -rf $(MPC_HOST_BUILD_DIR) +endef + mpc_host_clean: - $(Q)rm -rf $(MPC_HOST_BUILD_DIR) + $(Q)$(embtk_cleanup_mpc_host) @@ -37,5 +37,9 @@ MPFR_HOST_CONFIGURE_OPTS := --disable-shared --enable-static MPFR_HOST_CONFIGURE_OPTS += --with-gmp=$(GMP_HOST_DIR) MPFR_HOST_PREFIX := $(MPFR_HOST_DIR) +define embtk_cleanup_mpfr_host + rm -rf $(MPFR_HOST_BUILD_DIR) +endef + mpfr_host_clean: - $(Q)rm -rf $(MPFR_HOST_BUILD_DIR) + $(Q)$(embtk_cleanup_mpfr_host) diff --git a/mk/uclibc.mk b/mk/uclibc.mk index 4d5ff75..328b9be 100755 --- a/mk/uclibc.mk +++ b/mk/uclibc.mk @@ -84,7 +84,7 @@ $(UCLIBC_BUILD_DIR)/.headers_installed: download_uclibc_headers: $(call embtk_download_pkg,uClibc) -define embtk_uclibc_clean +define embtk_cleanup_uclibc if [ -d $(UCLIBC_BUILD_DIR) ]; then \ $(MAKE) -C $(UCLIBC_BUILD_DIR) distclean; \ rm -rf $(UCLIBC_BUILD_DIR)/.installed; \ @@ -92,8 +92,12 @@ define embtk_uclibc_clean fi endef +define embtk_cleanup_uclibc_headers + $(embtk_cleanup_uclibc) +endef + uclibc_clean uclibc_headers_clean: - $(Q)$(embtk_uclibc_clean) + $(Q)$(embtk_cleanup_uclibc) # # uClibc configuration macros and target # diff --git a/mk/zlib_host.mk b/mk/zlib_host.mk index 4399bc5..9c7b1a5 100644 --- a/mk/zlib_host.mk +++ b/mk/zlib_host.mk @@ -49,5 +49,9 @@ define embtk_beforeinstall_zlib_host $(embtk_configure_zlib_host) endef -zlib_host_clean: +define embtk_cleanup_zlib_host $(call embtk_pinfo,"Clean up zlib for host") +endef + +zlib_host_clean: + $(embtk_cleanup_zlib_host) diff --git a/packages/development/gdb/gdb.mk b/packages/development/gdb/gdb.mk index e91bd16..15661a6 100644 --- a/packages/development/gdb/gdb.mk +++ b/packages/development/gdb/gdb.mk @@ -78,6 +78,14 @@ $(GDB_BUILD_DIR)/.gdbserver_decompressed: $(call embtk_decompress_pkg,gdb) @touch $@ +define embtk_cleanup_gdbfull + $(call embtk_cleanup_pkg,gdb) +endef + +define embtk_cleanup_gdbserver + $(call embtk_cleanup_pkg,gdb) +endef + gdbserver_clean gdbfull_clean: $(call embtk_cleanup_pkg,gdb) @@ -109,8 +117,12 @@ GDB_HOST_CONFIGURE_OPTS := --disable-werror --disable-sim --disable-nls \ --target=$(STRICT_GNU_TARGET) GDB_HOST_PREFIX := $(embtk_tools) +define embtk_cleanup_gdb_host + rm -rf $(GDB_HOST_BUILD_DIR) +endef + gdb_host_clean: - $(Q)rm -rf $(GDB_HOST_BUILD_DIR) + $(Q)$(embtk_cleanup_gdb_host) # # Common for target and host development machine # |