Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kbuild: consistently decide when to rebuild a target

Browse source 
Consistently decide when to rebuild a target across all of
if_changed, if_changed_dep, if_changed_rule.
PHONY targets are now treated alike (ignored) for all targets

While add it make Kbuild.include almost readable by factoring out a few
bits to some common variables and reuse this in Makefile.build.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
Sam Ravnborg 2006-07-23 19:37:44 +02:00 committed by Sam Ravnborg
parent d3660a8cbd
commit 48f1f0589d
3 changed files with 35 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
scripts/Kbuild.include
View file

@ -7,10 +7,14 @@ squote := '
empty := empty :=
space := $(empty) $(empty) space := $(empty) $(empty)
###
# Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o
dot-target = $(dir $@).$(notdir $@)
### ###
# The temporary file to save gcc -MD generated dependencies must not # The temporary file to save gcc -MD generated dependencies must not
# contain a comma # contain a comma
depfile = $(subst $(comma),_,$(@D)/.$(@F).d) depfile = $(subst $(comma),_,$(dot-target).d)
### ###
# filename of target with directory and extension stripped # filename of target with directory and extension stripped
@ -119,40 +123,44 @@ objectify = $(foreach o,$(1),$(if $(filter /%,$(o)),$(o),$(obj)/$(o)))
ifneq ($(KBUILD_NOCMDDEP),1) ifneq ($(KBUILD_NOCMDDEP),1)
# Check if both arguments has same arguments. Result in empty string if equal # Check if both arguments has same arguments. Result in empty string if equal
# User may override this check using make KBUILD_NOCMDDEP=1 # User may override this check using make KBUILD_NOCMDDEP=1
arg-check = $(strip $(filter-out $(1), $(2)) $(filter-out $(2), $(1)) ) arg-check = $(strip $(filter-out $(cmd_$(1)), $(cmd_$@)) \
$(filter-out $(cmd_$@), $(cmd_$(1))) )
endif endif
# echo command. Short version is $(quiet) equals quiet, otherwise full command # echo command. Short version is $(quiet) equals quiet, otherwise full command
echo-cmd = $(if $($(quiet)cmd_$(1)), \ echo-cmd = $(if $($(quiet)cmd_$(1)), \
echo ' $(call escsq,$($(quiet)cmd_$(1)))';) echo ' $(call escsq,$($(quiet)cmd_$(1)))';)
# >'< substitution is for echo to work,
# >$< substitution to preserve $ when reloading .cmd file
# note: when using inline perl scripts [perl -e '...$$t=1;...']
# in $(cmd_xxx) double $$ your perl vars
make-cmd = $(subst \#,\\\#,$(subst $$,$$$$,$(call escsq,$(cmd_$(1))))) make-cmd = $(subst \#,\\\#,$(subst $$,$$$$,$(call escsq,$(cmd_$(1)))))
# function to only execute the passed command if necessary # Find any prerequisites that is newer than target or that does not exist.
# >'< substitution is for echo to work, >$< substitution to preserve $ when reloading .cmd file # PHONY targets skipped in both cases.
# note: when using inline perl scripts [perl -e '...$$t=1;...'] in $(cmd_xxx) double $$ your perl vars any-prereq = $(filter-out $(PHONY),$?) $(filter-out $(PHONY) $(wildcard $^),$^)
# Execute command if command has changed or prerequisitei(s) are updated
# #
if_changed = $(if $(strip $(filter-out $(PHONY),$?) \ if_changed = $(if $(strip $(any-prereq) $(arg-check)), \
$(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \ @set -e; \
@set -e; \ $(echo-cmd) $(cmd_$(1)); \
$(echo-cmd) $(cmd_$(1)); \ echo 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd)
echo 'cmd_$@ := $(make-cmd)' > $(@D)/.$(@F).cmd)
# execute the command and also postprocess generated .d dependencies # execute the command and also postprocess generated .d dependencies
# file # file
if_changed_dep = $(if $(strip $(filter-out $(PHONY),$?) \ if_changed_dep = $(if $(strip $(any-prereq) $(arg-check) ), \
$(filter-out FORCE $(wildcard $^),$^) \ @set -e; \
$(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \ $(echo-cmd) $(cmd_$(1)); \
@set -e; \ scripts/basic/fixdep $(depfile) $@ '$(make-cmd)' > $(dot-target).tmp;\
$(echo-cmd) $(cmd_$(1)); \ rm -f $(depfile); \
scripts/basic/fixdep $(depfile) $@ '$(make-cmd)' > $(@D)/.$(@F).tmp; \ mv -f $(dot-target).tmp $(dot-target).cmd)
rm -f $(depfile); \
mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd)
# Usage: $(call if_changed_rule,foo) # Usage: $(call if_changed_rule,foo)
# will check if $(cmd_foo) changed, or any of the prequisites changed, # will check if $(cmd_foo) changed, or any of the prequisites changed,
# and if so will execute $(rule_foo) # and if so will execute $(rule_foo)
if_changed_rule = $(if $(strip $(filter-out $(PHONY),$?) \ if_changed_rule = $(if $(strip $(any-prereq) $(arg-check) ), \
$(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),\ @set -e; \
@set -e; \ $(rule_$(1)))
$(rule_$(1)))

5
scripts/Makefile.build
View file

@ -191,9 +191,10 @@ define rule_cc_o_c
$(call echo-cmd,checksrc) $(cmd_checksrc) \ $(call echo-cmd,checksrc) $(cmd_checksrc) \
$(call echo-cmd,cc_o_c) $(cmd_cc_o_c); \ $(call echo-cmd,cc_o_c) $(cmd_cc_o_c); \
$(cmd_modversions) \ $(cmd_modversions) \
scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' > $(@D)/.$(@F).tmp; \ scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' > \
$(dot-target).tmp; \
rm -f $(depfile); \ rm -f $(depfile); \
mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd mv -f $(dot-target).tmp $(dot-target).cmd
endef endef
# Built-in and composite module parts # Built-in and composite module parts

2
usr/Makefile
View file

@ -3,6 +3,8 @@
# #
klibcdirs:; klibcdirs:;
PHONY += klibcdirs
# Generate builtin.o based on initramfs_data.o # Generate builtin.o based on initramfs_data.o
obj-y := initramfs_data.o obj-y := initramfs_data.o