From 589ca848c2170ce1a67a33ad3a19a71d8d606e64 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Wed, 8 Aug 2012 19:04:25 +0200 Subject: gbuild: there are no old components anymore ..and binfilter will die Change-Id: I9a773f06ed5332c2258f0a29ea39349b27ece2ac --- solenv/gbuild/Rdb.mk | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'solenv/gbuild/Rdb.mk') diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk index 7a85ff27af75..03281567c805 100644 --- a/solenv/gbuild/Rdb.mk +++ b/solenv/gbuild/Rdb.mk @@ -25,24 +25,12 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -# Component paths created by the old build system does not contain any -# directories. -gb_Rdb__is_old_component_target = $(if $(findstring /,$(1)),$(false),$(true)) - -gb_Rdb__get_old_component_target = $(OUTDIR)/xml/$(1).component - -define gb_Rdb__get_component_target -$(strip $(if $(call gb_Rdb__is_old_component_target,$(component))\ - ,$(call gb_Rdb__get_old_component_target,$(component))\ - ,$(call gb_ComponentTarget_get_outdir_target,$(component)))) -endef - define gb_Rdb__command $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ (\ echo '' && \ - $(foreach component,$(COMPONENTS),echo "$(call gb_Rdb__get_component_target,$(component))" &&) \ + $(foreach component,$(COMPONENTS),echo "$(call gb_ComponentTarget_get_outdir_target,$(component))" &&) \ echo '' \ ) > $(1).input && \ $(gb_XSLTPROC) --nonet -o $(1) $(SOLARENV)/bin/packcomponents.xslt $(1).input && \ @@ -78,7 +66,7 @@ $$(eval $$(call gb_Module_register_target,$(call gb_Rdb_get_outdir_target,$(1)), endef define gb_Rdb_add_component -$(call gb_Rdb_get_target,$(1)) : $(call gb_Rdb__get_component_target,$(2)) +$(call gb_Rdb_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2)) $(call gb_Rdb_get_target,$(1)) : COMPONENTS += $(2) $(call gb_Rdb_get_clean_target,$(1)) : COMPONENTS += $(2) -- cgit