diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-21 11:51:39 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-21 11:54:15 +0200 |
| commit | 8ee4e99a78a7a7f16bafa56e08ef9649cc69dbdb (patch) | |
| tree | 850a0c198d6693fd55ae9c07d894d95bf4aed76f /solenv | |
| parent | 39f3d87152f963510ac71d2f0b346188b9965c2f (diff) | |
some more work on the make countoutdated target
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/post_Counters.mk | 7 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_Counters.mk | 19 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 2 |
3 files changed, 21 insertions, 7 deletions
diff --git a/solenv/gbuild/extensions/post_Counters.mk b/solenv/gbuild/extensions/post_Counters.mk index 3552351ae603..c0efdccc2d51 100644 --- a/solenv/gbuild/extensions/post_Counters.mk +++ b/solenv/gbuild/extensions/post_Counters.mk @@ -29,6 +29,13 @@ ifneq ($(filter countoutdated,$(MAKECMDGOALS)),) gb_SrsTarget_add_template= gb_SrsTarget_add_templates= +gb_Output_announce= + +ifneq ($(strip $(filter-out countoutdated,$(MAKECMDGOALS))),) +countoutdated: $(filter-out countoutdated,$(MAKECMDGOALS)) +else +countoutdated: $(.DEFAULT_GOAL) +endif endif # vim: set noet ts=4 sw=4: diff --git a/solenv/gbuild/extensions/pre_Counters.mk b/solenv/gbuild/extensions/pre_Counters.mk index b0563d0fc2d2..feebe8cd52cc 100644 --- a/solenv/gbuild/extensions/pre_Counters.mk +++ b/solenv/gbuild/extensions/pre_Counters.mk @@ -25,23 +25,28 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -gb_CountersOutdated_COUNTER:= +gb_CountersOutdated_COUNTER_ALL:= +gb_CountersOutdated_COUNTER_TYPES:= .PHONY: countoutdated -countoutdated: $(filter-out countoutdated,$(MAKECMDGOALS)) - $(info total outdated files: $(words $(gb_CountersOutdated_COUNTER))) +countoutdated: + $(info total outdated files: $(words $(gb_CountersOutdated_COUNTER_ALL))) + $(info types of outdated files: $(gb_CountersOutdated_TYPES)) + $(foreach type,$(gb_CountersOutdated_TYPES),$(info $(type): $(words $(gb_CountersOutdated_COUNTER_$(type))))) @true ifneq ($(filter countoutdated,$(MAKECMDGOALS)),) +gb_CHECKOBJECTOWNER := $(false) + $(WORKDIR)/%: - $(info $* is outdated.) - $(eval gb_CountersOutdated_COUNTER+= x) + $(eval gb_CountersOutdated_COUNTER_ALL+= x) + $(eval gb_CountersOutdated__TYPE=$(firstword $(subst /, ,$*))) + $(if $(filter undefined,$(origin gb_CountersOutdated_COUNTER_$(gb_CountersOutdated__TYPE))),$(eval gb_CountersOutdated_COUNTER_$(gb_CountersOutdated__TYPE):=) $(eval gb_CountersOutdated_TYPES+=$(gb_CountersOutdated__TYPE))) + $(eval gb_CountersOutdated_COUNTER_$(gb_CountersOutdated__TYPE)+= x) @true $(OUTDIR)/%: - $(info $* is outdated (OUTDIR).) - $(eval gb_CountersOutdated_COUNTER+= x) @true endif diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index c91b99f1ce8f..22b92166257f 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -126,7 +126,9 @@ else gb_FULLDEPS := $(true) endif +ifeq ($(origin gb_CHECKOBJECTOWNER),undefined) gb_CHECKOBJECTOWNER := $(true) +endif # save user-supplied flags for latter use ifneq ($(strip $(CFLAGS)),) |