[Libreoffice-commits] .: Branch 'feature/gnumake4' - Repository.mk solenv/gbuild

[Bjoern Michaelsen]

 Repository.mk                    |    2 --
 solenv/gbuild/ComponentTarget.mk |    4 ++--
 solenv/gbuild/Jar.mk             |    2 +-
 solenv/gbuild/Zip.mk             |    2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 56f0ed8156c1d5f052162a3dd249326a85ace1c2
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 21:02:42 2011 +0200

    postmerge fixes for gnumake4

diff --git a/Repository.mk b/Repository.mk
index a296b46..bf8df09 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -90,7 +90,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     rpt \
     rptui \
     rptxml \
-    rtftok \
     sax \
     sb \
     sc \
@@ -140,7 +139,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	test \
-    cairo \
     cppunit \
     fileacc \
     icui18n \
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 3a6b0f0..573572f 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -73,8 +73,8 @@ $(call gb_ComponentTarget_get_inbuild_target,$(1)) : COMPONENTPREFIX := $(call g
 $(call gb_ComponentTarget_get_inbuild_target,$(1)) : LIBFILENAME := $(3)
 $(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1))
 $(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)) : $(call gb_ComponentTarget_get_inbuild_target,$(1))
-$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)))
-$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)),$(call gb_ComponentTarget_get_inbuild_target,$(1)))
+$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)),$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)),$(call gb_ComponentTarget_get_inbuild_target,$(1)),$(1))
 
 endef
 
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 4b985a7..3088bcc 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -77,7 +77,7 @@ $(call gb_Jar_get_target,$(1)) : PACKAGEROOTS :=
 $(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)),$(2))
 $(call gb_JavaClassSet_set_classpath,$(call gb_Jar_get_classsetname,$(1)),$(value XCLASSPATH))
 $(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_target,$(1)))
+$(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_target,$(1)),$(1))
 $(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1))
 
 endef
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index 4116c4f..023fe36 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -62,7 +62,7 @@ $(call gb_Zip_get_target,$(1)) : FILES :=
 $(call gb_Zip_get_target,$(1)) : LOCATION := $(2)
 gb_Package_Location_$(1) := $(2)
 $(eval $(call gb_Module_register_target,$(call gb_Zip_get_final_target,$(1)),$(call gb_Zip_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_Zip_get_outdir_target,$(1)),$(call gb_Zip_get_target,$(1)))
+$(call gb_Deliver_add_deliverable,$(call gb_Zip_get_outdir_target,$(1)),$(call gb_Zip_get_target,$(1)),$(1))
 $(call gb_Zip_get_outdir_target,$(1)) : $(call gb_Zip_get_target,$(1))
 
 endef