speed up the prepare step a bit

[openwrt.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index f31fc50..cccf174 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -1,5 +1,5 @@
 # 
 # 

-# Copyright (C) 2006,2007 OpenWrt.org
+# Copyright (C) 2006-2007 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -13,15 +13,30 @@ 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)/prereq.mk
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk

+include $(INCLUDE_DIR)/depends.mk
+
+STAMP_PREPARED:=$(PKG_BUILD_DIR)/.prepared$(if $(DUMP),,_$(shell find ${CURDIR} $(PKG_FILE_DEPEND) $(DEP_FINDPARAMS) | md5s))
+STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
+STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
+
+include $(INCLUDE_DIR)/quilt.mk

 include $(INCLUDE_DIR)/package-defaults.mk
 include $(INCLUDE_DIR)/package-dumpinfo.mk
 include $(INCLUDE_DIR)/package-ipkg.mk
 
 include $(INCLUDE_DIR)/package-defaults.mk
 include $(INCLUDE_DIR)/package-dumpinfo.mk
 include $(INCLUDE_DIR)/package-ipkg.mk
 

-STAMP_PREPARED:=$(PKG_BUILD_DIR)/.prepared
-STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
-STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
+override MAKEFLAGS=

 export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 
 export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 

+ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
+  ifneq ($(CONFIG_AUTOREBUILD),)
+    define Build/Autoclean
+      $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED)
+      $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED))
+      $(if $(filter prepare,$(MAKECMDGOALS)),,$(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT),$(PKG_BUILD_DIR)/.dep_files, -and -not -path "/.*" -and -not -path "*/ipkg*"))
+    endef
+  endif
+endif
+

 define Build/DefaultTargets
   ifneq ($(strip $(PKG_SOURCE_URL)),)
     download: $(DL_DIR)/$(PKG_SOURCE)
 define Build/DefaultTargets
   ifneq ($(strip $(PKG_SOURCE_URL)),)
     download: $(DL_DIR)/$(PKG_SOURCE)


@@ -33,14 +48,7 @@ define Build/DefaultTargets
     $(STAMP_PREPARED): $(DL_DIR)/$(PKG_SOURCE)
   endif
 
     $(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)
 
   $(STAMP_PREPARED):
        @-rm -rf $(PKG_BUILD_DIR)


@@ -54,13 +62,10 @@ define Build/DefaultTargets
 
   $(STAMP_BUILT): $(STAMP_CONFIGURED)
        $(Build/Compile)
 
   $(STAMP_BUILT): $(STAMP_CONFIGURED)
        $(Build/Compile)

+       @$(NO_TRACE_MAKE) $(PKG_BUILD_DIR)/.dep_files

        touch $$@
 
   ifdef Build/InstallDev
        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
     compile: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
     $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(STAMP_BUILT)
        mkdir -p $(STAGING_DIR)/stampfiles


@@ -68,9 +73,6 @@ define Build/DefaultTargets
        touch $$@
   endif
 
        touch $$@
   endif
 

-  package-rebuild: FORCE
-       @-rm -f $(STAMP_BUILT)
-

   define Build/DefaultTargets
   endef
 endef
   define Build/DefaultTargets
   endef
 endef