Changeset 8255


Ignore:
Timestamp:
2007-07-31T01:52:17+02:00 (9 years ago)
Author:
nbd
Message:

fix a rebuild bug related to quilt

Location:
trunk/include
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/depends.mk

    r8171 r8255  
    2020 
    2121  ifneq ($(3),) 
    22     ifneq ($$(shell find $(1) $(DEP_FINDPARAMS) $(4) 2>/dev/null | md5s),$(if $(3),$(shell cat $(3) 2>/dev/null))) 
     22    ifneq ($$(shell find $(1) $(DEP_FINDPARAMS) $(4) 2>/dev/null | md5s),$(if $(3),$(shell cat $(3) || touch $(3) 2>/dev/null))) 
    2323      $(2): $(3) 
    2424    endif 
    2525   
    26     $(3): FORCE 
     26  endif 
     27 
     28  $(3): FORCE 
    2729          @-find $(1) $(DEP_FINDPARAMS) $(4) 2>/dev/null | md5s > $$@ 
    28   endif 
     30  .PRECIOUS: $(3) 
    2931endef 
  • trunk/include/host-build.mk

    r8246 r8255  
    8181endif 
    8282 
    83 ifneq ($(CONFIG_AUTOREBUILD),) 
     83ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),) 
    8484  define HostBuild/Autoclean 
    8585    $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED) 
     
    106106  $(STAMP_BUILT): $(STAMP_CONFIGURED) 
    107107        $(call Build/Compile) 
    108         @$(NO_TRACE_MAKE) $(PKG_BUILD_DIR)/.dep_files 
    109108        touch $$@ 
    110109 
  • trunk/include/package.mk

    r8245 r8255  
    2929 
    3030ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),) 
    31   ifneq ($(CONFIG_AUTOREBUILD),) 
     31  ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),) 
    3232    define Build/Autoclean 
    3333      $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED) 
     
    3737  endif 
    3838endif 
     39 
    3940 
    4041define Build/DefaultTargets 
     
    6364  $(STAMP_BUILT): $(STAMP_CONFIGURED) 
    6465        $(Build/Compile) 
    65         @$(NO_TRACE_MAKE) $(PKG_BUILD_DIR)/.dep_files 
    6666        touch $$@ 
    6767 
Note: See TracChangeset for help on using the changeset viewer.