X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fhost-build.mk;h=ffb68468f9972a379cee39503d27433ddf2dc02a;hb=fec57b40c34a50020ff0976a769c69f2a4131e3e;hp=bbf4633c416f78950e19a92ab8d367d106ddec4d;hpb=d98bb7e6b96d5bb700800c797f68bf391335374d;p=openwrt%2Fstaging%2Fyousong.git diff --git a/include/host-build.mk b/include/host-build.mk index bbf4633c41..ffb68468f9 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/unpack.mk include $(INCLUDE_DIR)/depends.mk BUILD_TYPES += host -HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(HOST_QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))) +HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(HOST_QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))_$(call confvar,CONFIG_AUTOREMOVE $(HOST_PREPARED_DEPENDS))) HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built HOST_BUILD_PREFIX:=$(if $(IS_PACKAGE_BUILD),$(STAGING_DIR_HOSTPKG),$(STAGING_DIR_HOST)) @@ -35,6 +35,8 @@ override MAKEFLAGS= include $(INCLUDE_DIR)/quilt.mk include $(INCLUDE_DIR)/autotools.mk +_host_target:=$(if $(HOST_QUILT),,.) + Host/Patch:=$(Host/Patch/Default) ifneq ($(strip $(HOST_UNPACK)),) define Host/Prepare/Default @@ -106,7 +108,7 @@ define Host/Compile endef define Host/Install/Default - $(_SINGLE)$(MAKE) -C $(HOST_BUILD_DIR) install + $(call Host/Compile/Default,install) endef define Host/Install @@ -174,15 +176,21 @@ ifndef DUMP $(t): host-$(t) .$(t): .host-$(t) ) + clean-build: host-clean-build endif - .host-prepare: $(HOST_STAMP_PREPARED) - .host-configure: $(HOST_STAMP_CONFIGURED) - .host-compile: $(HOST_STAMP_BUILT) $(HOST_STAMP_INSTALLED) - host-clean: FORCE + $(_host_target)host-prepare: $(HOST_STAMP_PREPARED) + $(_host_target)host-configure: $(HOST_STAMP_CONFIGURED) + $(_host_target)host-compile: $(HOST_STAMP_BUILT) $(HOST_STAMP_INSTALLED) + host-install: host-compile + + host-clean-build: FORCE + rm -rf $(HOST_BUILD_DIR) $(HOST_STAMP_BUILT) + + host-clean: host-clean-build $(call Host/Clean) $(call Host/Uninstall) - rm -rf $(HOST_BUILD_DIR) $(HOST_STAMP_INSTALLED) $(HOST_STAMP_BUILT) + rm -rf $(HOST_STAMP_INSTALLED) ifneq ($(CONFIG_AUTOREMOVE),) host-compile: