move target libstb-hal-clean to cleantargets.mk

diff --git a/make/cleantargets.mk b/make/cleantargets.mk
index 3d12adf874a7c4ca0ad0421b4ca55cdd829abe67..076d70d34e15fd30bd1865843924e191f5335b93 100755 (executable)
--- 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 ef2a0c593e1bb6b2febb58b09b9022d4b153c989..a290e2f0d9e921fbbc5d2b571456c604071bd1ff 100755 (executable)
--- 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 0993ca76f86d8511e5825f86753e7918ed4317b2..0cc6be193da73ed790a7b0e3c5f4d59276bddaab 100755 (executable)
--- 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; \