diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-04-15 18:28:24 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-04-15 18:28:24 +0000 |
| commit | 449a4f40792a7453f65799329e828f0f55e14ab3 (patch) | |
| tree | c4fa6b092976f796e0d5e632351f33f70e40e7a1 /include/package.mk | |
| parent | 4e7c9df1ae14a2af3678d7d7eff177c62a42e716 (diff) | |
| download | upstream-449a4f40792a7453f65799329e828f0f55e14ab3.tar.gz upstream-449a4f40792a7453f65799329e828f0f55e14ab3.tar.bz2 upstream-449a4f40792a7453f65799329e828f0f55e14ab3.zip | |
clean up dependency handling for autorebuilds
SVN-Revision: 6956
Diffstat (limited to 'include/package.mk')
| -rw-r--r-- | include/package.mk | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/include/package.mk b/include/package.mk index f31fc50d54..2821493bf9 100644 --- a/include/package.mk +++ b/include/package.mk @@ -13,6 +13,7 @@ PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/prereq.mk include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/unpack.mk +include $(INCLUDE_DIR)/depends.mk include $(INCLUDE_DIR)/package-defaults.mk include $(INCLUDE_DIR)/package-dumpinfo.mk include $(INCLUDE_DIR)/package-ipkg.mk @@ -22,6 +23,14 @@ STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured STAMP_BUILT:=$(PKG_BUILD_DIR)/.built export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME) +ifneq ($(CONFIG_AUTOREBUILD),) + define Build/Autoclean + $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED) + $(call rdep,${CURDIR},$(STAMP_PREPARED),$(TMP_DIR)/.packagedir_$(shell echo "${CURDIR}" | md5s)) + $(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT),$(PKG_BUILD_DIR)/.dep_files, -and -not -path "/.*" -and -not -path "*/ipkg*") + endef +endif + define Build/DefaultTargets ifneq ($(strip $(PKG_SOURCE_URL)),) download: $(DL_DIR)/$(PKG_SOURCE) @@ -33,14 +42,7 @@ define Build/DefaultTargets $(STAMP_PREPARED): $(DL_DIR)/$(PKG_SOURCE) endif - ifeq ($(DUMP),) - ifeq ($(CONFIG_AUTOREBUILD),y) - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(PKG_FILE_DEPEND)),$(PKG_BUILD_DIR)) - $$(info Forcing package rebuild) - $(STAMP_PREPARED): clean - endif - endif - endif + $(call Build/Autoclean) $(STAMP_PREPARED): @-rm -rf $(PKG_BUILD_DIR) @@ -54,13 +56,10 @@ define Build/DefaultTargets $(STAMP_BUILT): $(STAMP_CONFIGURED) $(Build/Compile) + @$(MAKE) $(PKG_BUILD_DIR)/.dep_files touch $$@ ifdef Build/InstallDev - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed $(PKG_BUILD_DIR)),$(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed) - $(STAMP_BUILT): package-rebuild - endif - compile: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(STAMP_BUILT) mkdir -p $(STAGING_DIR)/stampfiles @@ -68,9 +67,6 @@ define Build/DefaultTargets touch $$@ endif - package-rebuild: FORCE - @-rm -f $(STAMP_BUILT) - define Build/DefaultTargets endef endef |