diff options
| author | Nicolas Thill <nico@openwrt.org> | 2009-04-27 16:02:21 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2009-04-27 16:02:21 +0000 |
| commit | 414ea4bc49181656bf5f8a8bce60cdbe7a229e17 (patch) | |
| tree | 59c9ca1cd46b72c4a5e722e8cbf8bb12374f7d03 | |
| parent | 07f45e3a7d16b94f0ef2c5e7e04f111c408cdf8d (diff) | |
| download | upstream-414ea4bc49181656bf5f8a8bce60cdbe7a229e17.tar.gz upstream-414ea4bc49181656bf5f8a8bce60cdbe7a229e17.tar.bz2 upstream-414ea4bc49181656bf5f8a8bce60cdbe7a229e17.zip | |
add missing bits from [15451]
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15453 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/host-build.mk | 4 | ||||
| -rw-r--r-- | include/package.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/host-build.mk b/include/host-build.mk index af46c3e245..e04cd08985 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -13,7 +13,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_DEPEND),))) +HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(HOST_QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))) HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built HOST_STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.$(PKG_NAME)_installed @@ -89,7 +89,7 @@ endef ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),) define HostHost/Autoclean - $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(HOST_STAMP_PREPARED)) + $(call rdep,${CURDIR} $(PKG_FILE_DEPENDS),$(HOST_STAMP_PREPARED)) $(if $(if $(Host/Compile),$(filter prepare,$(MAKECMDGOALS)),1),,$(call rdep,$(HOST_BUILD_DIR),$(HOST_STAMP_BUILT))) endef endif diff --git a/include/package.mk b/include/package.mk index bd52c85265..79e1f143db 100644 --- a/include/package.mk +++ b/include/package.mk @@ -42,7 +42,7 @@ ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),) ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),) define Build/Autoclean $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED) - $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED),$(PKG_BUILD_DIR)/.dep_files,-x "*/.dep_*") + $(call rdep,${CURDIR} $(PKG_FILE_DEPENDS),$(STAMP_PREPARED),$(PKG_BUILD_DIR)/.dep_files,-x "*/.dep_*") $(if $(filter prepare,$(MAKECMDGOALS)),,$(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT),,-x "*/.dep_*" -x "*/ipkg*")) endef endif |