summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-06-19 13:52:44 +0200
committerMichael Stahl <mstahl@redhat.com>2013-09-09 22:09:10 +0200
commitd44759e3d78d23b360f8b628857a96618dae5cbd (patch)
treee35beb804e06c9e54d441b85f6fb97e2da98f936 /solenv
parentd78e4f0c461d80c17aa813c7ee6c04b5cee881b0 (diff)
gbuild: install rdb files directly in module they come from
Change-Id: I3a9cb4ce71cfb02b7378289a36aa0eb6e3a42f26
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/Rdb.mk9
-rw-r--r--solenv/gbuild/UnoApi.mk8
2 files changed, 17 insertions, 0 deletions
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 5bfa3a2113af..47d4d203ef50 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -29,6 +29,8 @@ $(call gb_Rdb_get_clean_target,%) :
$(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
+
define gb_Rdb_Rdb
$(call gb_Rdb_get_target,$(1)) : COMPONENTS :=
$(call gb_Rdb_get_outdir_target,$(1)) : $(call gb_Rdb_get_target,$(1)) \
@@ -39,6 +41,13 @@ $$(eval $$(call gb_Module_register_target,$(call gb_Rdb_get_outdir_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_Rdb_get_target,$(1)))
+
+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)
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 6cadaf998e7b..373953052fe3 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -37,6 +37,14 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi)
endef
+define gb_UnoApi_install
+$(if $(2),,$(call gb_Output_error,gb_UnoApi_install: missing install name.))
+$(call gb_Helper_install,$(call gb_UnoApi_get_target,$(1)), \
+ $(INSTDIR)/$(2), \
+ $(call gb_UnoApiTarget_get_target,$(1)))
+
+endef
+
ifneq ($(gb_UnoApi_ENABLE_INSTALL),)
# Create a package of IDL files for putting into SDK.