Commit e4f62b92 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Andrei Vagin

nmk: Add collect-hostprogs-deps helper

Thus will include hostprogs deps only if requested.
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent 733c5b0b
...@@ -255,6 +255,11 @@ $(foreach t,$(libso-y),$(eval $(call gen-so-link-rules,$(t)))) ...@@ -255,6 +255,11 @@ $(foreach t,$(libso-y),$(eval $(call gen-so-link-rules,$(t))))
# #
# Figure out if the target we're building needs deps to include. # Figure out if the target we're building needs deps to include.
define collect-hostprogs-deps
ifeq ($(1),$(2))
deps-y += $(addprefix $(obj)/,$($(1)-objs:.o=.d))
endif
endef
define collect-deps define collect-deps
ifneq ($(filter-out %.d,$(1)),) ifneq ($(filter-out %.d,$(1)),)
ifneq ($(filter %.o %.i %.s,$(1)),) ifneq ($(filter %.o %.i %.s,$(1)),)
...@@ -267,11 +272,12 @@ define collect-deps ...@@ -267,11 +272,12 @@ define collect-deps
ifeq ($(lib-target),$(1)) ifeq ($(lib-target),$(1))
deps-y += $(lib-y:.o=.d) deps-y += $(lib-y:.o=.d)
endif endif
$(foreach t,$(hostprogs-y),$(eval $(call collect-hostprogs-deps,$(t),$(1))))
ifneq ($(filter all $(filter-out $(builtin-target) $(lib-target), $(all-y)) $(hostprogs-y),$(1)),) ifneq ($(filter all $(filter-out $(builtin-target) $(lib-target), $(all-y)) $(hostprogs-y),$(1)),)
deps-y += $(obj-y:.o=.d) deps-y += $(obj-y:.o=.d)
deps-y += $(lib-y:.o=.d) deps-y += $(lib-y:.o=.d)
deps-y += $(foreach t,$(target),$(call objectify,$($(t)-lib-y:.o=.d)) $(call objectify,$($(t)-obj-y:.o=.d))) deps-y += $(foreach t,$(target),$(call objectify,$($(t)-lib-y:.o=.d)) $(call objectify,$($(t)-obj-y:.o=.d)))
deps-y += $(foreach t,$(hostprogs-y),$(addprefix $(obj)/,$($(t)-objs:.o=.d))) $(foreach t,$(hostprogs-y),$(eval $(call collect-hostprogs-deps,$(t),$(t))))
endif endif
endef endef
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment