From 57127d8916fee08e09cc95256eaf5f53d4b1ba2b Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 7 Sep 2006 12:14:08 +0000 Subject: fix unnecessary rebuilds for library package directories with no selected packages git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4767 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/include/package.mk b/include/package.mk index 9a947f3582..515698d691 100644 --- a/include/package.mk +++ b/include/package.mk @@ -17,20 +17,10 @@ define Build/DefaultTargets ifeq ($(CONFIG_AUTOREBUILD),y) _INFO:= ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) - _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) + _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) $(PKG_BUILD_DIR)/.prepared: package-clean endif - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1))) - _INFO+=$(subst $(TOPDIR)/,,$(IPKG_$(1))) - $(PKG_BUILD_DIR)/.built: package-rebuild - endif - - ifneq ($(MAKECMDGOALS),prereq) - ifneq ($$(_INFO),) - $$(info Rebuilding $$(_INFO)) - endif - endif endif endif @@ -241,6 +231,19 @@ define BuildPackage @touch $$@ $$(eval $$(call Build/DefaultTargets,$(1))) + + ifneq ($$(CONFIG_PACKAGE_$(1)),) + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $$(IPKG_$(1)) $(PKG_BUILD_DIR)),$$(IPKG_$(1))) + _INFO+=$(subst $(TOPDIR)/,,$$(IPKG_$(1))) + $(PKG_BUILD_DIR)/.built: package-rebuild + endif + + ifneq ($(MAKECMDGOALS),prereq) + ifneq ($$(_INFO),) + $$(info Rebuilding $$(_INFO)) + endif + endif + endif endef ifneq ($(strip $(PKG_CAT)),) -- cgit v1.2.3