diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-12 13:10:32 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-12 14:39:00 +0200 |
| commit | 6667caef24557d66177c1f7e9b72d2f609233d87 (patch) | |
| tree | 06edc4f20a78b2610e99aefa550b62de85685693 /solenv/gbuild/Rdb.mk | |
| parent | 3b0654ab0fa2408bd660f80a56254df16339cf4d (diff) | |
gbuild: remove gb_Rdb__get_final_target
... by replacing gb_Rdb_install with a separate constructor so the right
target can be registered at the module. There is still an ugly special
case for the ure/services.
Change-Id: I81c004143f201aaf38daca99819888313ee24f49
Diffstat (limited to 'solenv/gbuild/Rdb.mk')
| -rw-r--r-- | solenv/gbuild/Rdb.mk | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk index 980f2c8f9821..b3dcaff109d3 100644 --- a/solenv/gbuild/Rdb.mk +++ b/solenv/gbuild/Rdb.mk @@ -8,7 +8,6 @@ # gb_Rdb__get_install_target = $(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/services/$(1).rdb -gb_Rdb__get_final_target = $(WORKDIR)/Rdb/$(1).final define gb_Rdb__command $(call gb_Helper_abbreviate_dirs,\ @@ -30,26 +29,34 @@ $(call gb_Rdb_get_target,%) :| $(call gb_ExternalExecutable_get_dependencies,xsl $(call gb_Rdb_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),RDB,1) $(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_Rdb__get_final_target,$*) $(call gb_Rdb_get_target,$*)) - -$(call gb_Rdb__get_final_target,%) : - touch $@ + rm -f $(call gb_Rdb__get_install_target,$*) $(call gb_Rdb_get_target,$*)) -define gb_Rdb_Rdb +define gb_Rdb__Rdb_impl $(call gb_Rdb_get_target,$(1)) : COMPONENTS := -$(call gb_Rdb__get_final_target,$(1)) : $(call gb_Rdb_get_target,$(1)) -$$(eval $$(call gb_Module_register_target,$(call gb_Rdb__get_final_target,$(1)),$(call gb_Rdb_get_clean_target,$(1)))) -$(call gb_Helper_make_userfriendly_targets,$(1),Rdb,$(call gb_Rdb_get_target,$(1))) +$$(eval $$(call gb_Module_register_target,$(2),$(call gb_Rdb_get_clean_target,$(1)))) +$(call gb_Helper_make_userfriendly_targets,$(1),Rdb,$(2)) endef -define gb_Rdb_install -$(call gb_Helper_install,$(call gb_Rdb__get_final_target,$(1)), \ +define gb_Rdb_Rdb +$(call gb_Rdb__Rdb_impl,$(1),$(call gb_Rdb_get_target,$(1))) + +endef + +# FIXME this needs some layer-like thing for the special case in URE +define gb_Rdb_Rdb_install +$(call gb_Rdb__Rdb_impl,$(1),$(if $(2),$(gb_INSTROOT)/$(2),$(call gb_Rdb__get_install_target,$(1)))) +$(call gb_Helper_install_final, \ $(if $(2),$(gb_INSTROOT)/$(2),$(call gb_Rdb__get_install_target,$(1))), \ $(call gb_Rdb_get_target,$(1))) endef +define gb_Rdb_install +$(error gb_Rdb_install removed use gb_Rdb_Rdb_install instead) + +endef + define gb_Rdb_add_component $(call gb_Rdb_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2)) $(call gb_Rdb_get_target,$(1)) : COMPONENTS += $(2) |