From b48fdcd7ddbbe5682fd8422e9056adb4f6ce7d39 Mon Sep 17 00:00:00 2001 From: Markham Date: Sat, 28 Apr 2018 11:23:05 +0200 Subject: [PATCH] move target libstb-hal-clean to cleantargets.mk --- make/cleantargets.mk | 19 ++++++++++++++++++- make/neutrino.mk | 8 -------- make/prerequisites.mk | 3 ++- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/make/cleantargets.mk b/make/cleantargets.mk index 3d12adf..076d70d 100755 --- a/make/cleantargets.mk +++ b/make/cleantargets.mk @@ -40,4 +40,21 @@ neutrino-clean: rootfs-clean: -rm -rf $(BUILD_TMP)/rootfs -PHONY += clean rebuild-clean all-clean bootloader-clean flashimage-clean kernel-clean neutrino-clean rootfs-clean +libstb-hal-clean: + -make -C $(LH_OBJDIR) clean + -rm $(LH_OBJDIR)/config.status + -rm $(D)/libstb-hal + +libstb-hal-clean-all: libstb-hal-clean + -rm -r $(LH_OBJDIR) + +PHONY += clean +PHONY += rebuild-clean +PHONY += all-clean +PHONY += bootloader-clean +PHONY += flashimage-clean +PHONY += kernel-clean +PHONY += neutrino-clean +PHONY += rootfs-clean +PHONY += libstb-hal-clean +PHONY += libstb-hal-clean-all diff --git a/make/neutrino.mk b/make/neutrino.mk index ef2a0c5..a290e2f 100755 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -170,14 +170,6 @@ $(D)/libstb-hal: $(LH_OBJDIR)/config.status $(REWRITE_LIBTOOL)/libstb-hal.la $(TOUCH) -libstb-hal-clean: - -make -C $(LH_OBJDIR) clean - -rm $(LH_OBJDIR)/config.status - -rm $(D)/libstb-hal - -libstb-hal-clean-all: libstb-hal-clean - -rm -r $(LH_OBJDIR) - neutrino-version: $(TARGETPREFIX)/bin/neutrino if [ -e $(BASE_DIR)/customize/version.sh ]; then \ $(BASE_DIR)/customize/version.sh $(PLATFORM) $(BOXMODEL); \ diff --git a/make/prerequisites.mk b/make/prerequisites.mk index 0993ca7..0cc6be1 100755 --- a/make/prerequisites.mk +++ b/make/prerequisites.mk @@ -45,7 +45,8 @@ $(GIT_LIBSTB_HAL): cd $(GIT_LIBSTB_HAL) && \ git checkout mpx; \ git pull origin mpx; \ - rm -f $(D)/libstb-hal; \ + cd $(BASE_DIR); \ + $(MAKE) libstb-hal-clean; \ else \ cd $(SOURCE_DIR)/git; \ git clone $(CSGIT)/$(REPO_LIBSTB_HAL) LIBSTB_HAL; \ -- 2.39.5