[Libreoffice-commits] .: RepositoryExternal.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Nov 6 11:38:35 PST 2012


 RepositoryExternal.mk |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit ac3c7ba458040410736b46927dac91130d8adb08
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 6 20:38:47 2012 +0100

    make gb_LinkTarget__use_gthread/_gobject work again; used in vcl/connectivity
    
    Change-Id: I30b249de52822dbd8c327c2213c5a7868a460fdd

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6d68b30..c943f85 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1300,7 +1300,7 @@ endif
 endef
 
 define gb_LinkTarget__use_gthread
-$(error gb_LinkTarget__use_gthread should not be used any more)
+$(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS))
 endef
 
 ifeq ($(ENABLE_CUPS),TRUE)
@@ -1621,7 +1621,14 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
 endif # SYSTEM_CLUCENE
 
 define gb_LinkTarget__use_gobject
-$(error gb_LinkTarget__use_gobject should not be used any more)
+$(call gb_LinkTarget_add_libs,$(1),\
+       $(GOBJECT_LIBS) \
+)
+
+$(call gb_LinkTarget_set_include,$(1),\
+       $$(INCLUDE) \
+       $(GOBJECT_CFLAGS) \
+)
 endef
 
 ifeq ($(SYSTEM_HSQLDB),YES)


More information about the Libreoffice-commits mailing list