summaryrefslogtreecommitdiff
path: root/solenv/gbuild/Package.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-06-07 14:04:06 +0200
committerMichael Stahl <mstahl@redhat.com>2012-06-07 14:06:03 +0200
commit31a353719851b08664b7f13ca59f39a993e66ba6 (patch)
treebf85ece35eb8a88a43e6fd3d65eb3ba772456237 /solenv/gbuild/Package.mk
parent866599ab5ce091de56094d4d458e010ba56d22d0 (diff)
gbuild: introduce gb_Package_Package_internal:
The gb_InternalUnoApi_set_xmlfile function creates a new package, which registers at the current Module, overwriting the InternalUnoApi targets set there and causing make clean not to clean the InternalUnoApi. Change-Id: I46e9b4437788a479701187334325fe1e065e612c
Diffstat (limited to 'solenv/gbuild/Package.mk')
-rw-r--r--solenv/gbuild/Package.mk11
1 files changed, 8 insertions, 3 deletions
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 02d447ca8655..e1d199e4f142 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -67,15 +67,20 @@ $(call gb_Package_get_target,%) :
$(call gb_Output_announce,$*,$(true),PKG,2)
mkdir -p $(dir $@) && touch $@
-
-define gb_Package_Package
+# for other targets that want to create Packages, does not register at Module
+define gb_Package_Package_internal
gb_Package_SOURCEDIR_$(1) := $(2)
$(call gb_Package_get_clean_target,$(1)) : FILES := $(call gb_Package_get_target,$(1)) $(call gb_Package_get_preparation_target,$(1))
-$$(eval $$(call gb_Module_register_target,$(call gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1))))
$(call gb_Package_get_target,$(1)) : $(call gb_Package_get_preparation_target,$(1))
endef
+define gb_Package_Package
+$(call gb_Package_Package_internal,$(1),$(2))
+$$(eval $$(call gb_Module_register_target,$(call gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1))))
+
+endef
+
define gb_Package_add_file
$(call gb_Package_get_target,$(1)) : $(OUTDIR)/$(2)
$(call gb_Package_get_clean_target,$(1)) : FILES += $(OUTDIR)/$(2)