summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-03-31 15:01:40 +0200
committerDavid Tardon <dtardon@redhat.com>2013-03-31 20:35:32 +0200
commit56f1ec87d26ffcd970ab4225e1652a7a698a845c (patch)
tree43d78780ce6ad511bca745b8e18fab45899896e5
parente49111d67c062e37077dd515357d029c61745373 (diff)
do not deliver unneeded zips
Change-Id: I00ac0593e94203994bd3626c6ebb6d5b97441aa6
-rw-r--r--solenv/gbuild/Pyuno.mk3
-rw-r--r--solenv/gbuild/ZipPackage.mk2
-rw-r--r--solenv/gbuild/ZipUnoApi.mk2
3 files changed, 4 insertions, 3 deletions
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index b0d298421428..3384eed85d16 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -35,9 +35,10 @@ $(call gb_Pyuno_get_clean_target,%) :
rm -f $(call gb_Pyuno_get_target,$*) $(call gb_Pyuno_get_outdir_target,$*)
define gb_Pyuno_Pyuno
-$(call gb_Zip_Zip,Pyuno/$(1),$(2))
+$(call gb_Zip_Zip_internal_nodeliver,Pyuno/$(1),$(2))
$$(eval $$(call gb_Module_register_target,$(call gb_Pyuno_get_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Pyuno)
+$(call gb_Deliver_add_deliverable,$(call gb_Pyuno_get_outdir_target,$(1)),$(call gb_Zip_get_target,Pyuno/$(1)),$(1))
$(call gb_Pyuno_get_target,$(1)) : $(call gb_Pyuno_get_outdir_target,$(1))
$(call gb_Pyuno_get_outdir_target,$(1)) : $(call gb_Zip_get_target,Pyuno/$(1))
$(call gb_Pyuno_get_outdir_target,$(1)) :| $(dir $(call gb_Pyuno_get_outdir_target,$(1))).dir
diff --git a/solenv/gbuild/ZipPackage.mk b/solenv/gbuild/ZipPackage.mk
index 16912143e9ff..bc016aed3126 100644
--- a/solenv/gbuild/ZipPackage.mk
+++ b/solenv/gbuild/ZipPackage.mk
@@ -17,7 +17,7 @@ gb_Zip_get_outdir_bin_target = $(OUTDIR)/bin/$(1).zip
define gb_ZipPackage_ZipPackage
$(call gb_Package_Package,$(1),$(2))
-$(call gb_Zip_Zip_internal,$(1),$(WORKDIR)/Zip/$(1))
+$(call gb_Zip_Zip_internal_nodeliver,$(1),$(WORKDIR)/Zip/$(1))
$(call gb_Package_get_target,$(1)) : $(call gb_Zip_get_outdir_bin_target,$(1))
$(call gb_Zip_get_outdir_bin_target,$(1)) : $(call gb_Zip_get_target,$(1))
cp $$< $$@
diff --git a/solenv/gbuild/ZipUnoApi.mk b/solenv/gbuild/ZipUnoApi.mk
index 56e0c6adbbea..d6bd3b95a247 100644
--- a/solenv/gbuild/ZipUnoApi.mk
+++ b/solenv/gbuild/ZipUnoApi.mk
@@ -14,7 +14,7 @@
define gb_ZipUnoApi_ZipUnoApi
$(call gb_UnoApi_UnoApi,$(1),$(2))
-$(call gb_Zip_Zip_internal,$(1),$(WORKDIR)/Zip/$(1))
+$(call gb_Zip_Zip_internal_nodeliver,$(1),$(WORKDIR)/Zip/$(1))
$(call gb_UnoApi_get_target,$(1)) : $(call gb_Zip_get_outdir_bin_target,$(1))
$(call gb_Zip_get_outdir_bin_target,$(1)) : $(call gb_Zip_get_target,$(1))
cp $$< $$@