diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-05-24 12:24:27 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-09-10 22:58:04 +0200 |
| commit | b469cd235bba961abc71d26ddc97423906a2d67e (patch) | |
| tree | 670fe1feb75c3881d931d378c4fd9bc6412b14ca /solenv/gbuild/Rdb.mk | |
| parent | 21eae1933ccbaf3399dd63df2db44ad0f302edf4 (diff) | |
gbuild: use xml .rdb files directly from workdir
Change-Id: I876a41dc77a59841c39b2c1fa43f22c20940dbf2
Diffstat (limited to 'solenv/gbuild/Rdb.mk')
| -rw-r--r-- | solenv/gbuild/Rdb.mk | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk index 47d4d203ef50..afb668196fd2 100644 --- a/solenv/gbuild/Rdb.mk +++ b/solenv/gbuild/Rdb.mk @@ -7,6 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # +gb_Rdb__get_install_target = $(INSTDIR)/$(gb_PROGRAMDIRNAME)/services/$(1).rdb +gb_Rdb__get_final_target = $(WORKDIR)/Rdb/$(1).final + define gb_Rdb__command $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -27,23 +30,22 @@ $(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_outdir_target,$*) $(call gb_Rdb_get_target,$*)) - -gb_Rdb_get_install_target = $(INSTDIR)/$(gb_PROGRAMDIRNAME)/services/$(1).rdb + rm -f $(call gb_Rdb__get_final_target,$*) $(call gb_Rdb_get_target,$*)) + +$(call gb_Rdb__get_final_target,%) : + touch $@ define gb_Rdb_Rdb $(call gb_Rdb_get_target,$(1)) : COMPONENTS := -$(call gb_Rdb_get_outdir_target,$(1)) : $(call gb_Rdb_get_target,$(1)) \ - | $(dir $(call gb_Rdb_get_outdir_target,$(1))).dir -$(call gb_Deliver_add_deliverable,$(call gb_Rdb_get_outdir_target,$(1)),$(call gb_Rdb_get_target,$(1)),$(1)) +$(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,$(call gb_Rdb_get_outdir_target,$(1)),$(call gb_Rdb_get_clean_target,$(1)))) -$(call gb_Helper_make_userfriendly_targets,$(1),Rdb,$(call gb_Rdb_get_outdir_target,$(1))) endef define gb_Rdb_install -$(call gb_Helper_install,$(call gb_Rdb_get_outdir_target,$(1)), \ - $(if $(2),$(INSTDIR)/$(2),$(call gb_Rdb_get_install_target,$(1))), \ +$(call gb_Helper_install,$(call gb_Rdb__get_final_target,$(1)), \ + $(if $(2),$(INSTDIR)/$(2),$(call gb_Rdb__get_install_target,$(1))), \ $(call gb_Rdb_get_target,$(1))) endef |