From 2e1b6bfda921dcb853141304b2c487b1c61d6a30 Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sat, 21 Jan 2012 20:37:33 +0100 Subject: Revert "Build system: create FORCE and .PHONY targets to try to improve performance" This reverts commit 97928cab4442cfab746142d1247c133bac65c5f7. We are not ready for this, it breaks many packages install target. Signed-off-by: Abdoulaye Walsimou Gaye --- Makefile | 4 ---- mk/buildsystem.mk | 3 --- mk/packages.mk | 9 +++------ mk/toolchain.mk | 5 +---- 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index e8f3a19..0150714 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,6 @@ export Q -include .config -EMBTK_PHONIES := All EMBTK_BUILD := $(if $(CONFIG_EMBTK_DOTCONFIG),startbuild,xconfig) All: $(EMBTK_BUILD) @@ -90,6 +89,3 @@ include mk/toolchain.mk include mk/packages.mk include mk/rootfs.mk include mk/help.mk - -.PHONY: $(EMBTK_PHONIES) -FORCE: diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk index 571d29d..77ef1ad 100644 --- a/mk/buildsystem.mk +++ b/mk/buildsystem.mk @@ -170,6 +170,3 @@ rmallpath: $(Q)rm -rf $(SYSROOT)* $(HOSTTOOLS)* $(EMBTK_GENERATED)/rootfs-* $(Q)rm -rf $(EMBTK_GENERATED)/initramfs-* $(Q)$(if $(CONFIG_EMBTK_CACHE_PATCHES),,rm -rf $(DOWNLOAD_DIR)/*.patch) - -EMBTK_PHONIES += xconfig menuconfig randconfig basic clean distclean startbuild -EMBTK_PHONIES += mkinitialpath rmallpath diff --git a/mk/packages.mk b/mk/packages.mk index 8e8b849..2e27261 100644 --- a/mk/packages.mk +++ b/mk/packages.mk @@ -96,19 +96,16 @@ endif # # This install implicit rule is intended for autotool'ed packages -%_install: FORCE +%_install: $(call embtk_install_$(findstring host,$@)pkg,$*) # Download generic implicit rule -download_%: FORCE +download_%: $(call embtk_download_pkg,$*) # clean generic implicit rule -%_clean: FORCE +%_clean: $(call embtk_cleanup_pkg,$*) # Download target for offline build packages_fetch:: $(patsubst %_install,download_%,$(ROOTFS_COMPONENTS-y) $(HOSTTOOLS_COMPONENTS-y)) - -EMBTK_PHONIES += $(ROOTFS_COMPONENTS-y) $(HOSTTOOLS_COMPONENTS-y) -EMBTK_PHONIES += $(ROOTFS_COMPONENTS_CLEAN) diff --git a/mk/toolchain.mk b/mk/toolchain.mk index dd85fe8..14d35ef 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -178,7 +178,7 @@ __embtk_toolchain_addons_inst = $(strip $(if $(call __embtk_pkg_installed-y,tool __embtk_toolchain_buildargs = $(__embtk_toolchain_core_inst) __embtk_toolchain_buildargs += $(__embtk_toolchain_addons_inst) -buildtoolchain: FORCE +buildtoolchain: $(Q)$(call __embtk_toolchain_build,$(__embtk_toolchain_buildargs)) # Download target for offline build @@ -186,6 +186,3 @@ TOOLCHAIN_ALL_DEPS := $(TOOLCHAIN_PRE_DEPS) $(TOOLCHAIN_DEPS) TOOLCHAIN_ALL_DEPS += $(TOOLCHAIN_ADDONS_DEPS) packages_fetch:: $(patsubst %_install,download_%,$(TOOLCHAIN_ALL_DEPS)) - -EMBTK_PHONIES += buildtoolchain $(TOOLCHAIN_PRE_DEPS) -EMBTK_PHONIES += $(TOOLCHAIN_ADDONS-y) $(TOOLCHAIN_ADDONS-) -- cgit v1.2.3