RepositoryExternal.mk | 2 +-
solenv/gbuild/LinkTarget.mk | 9 ---------
2 files changed, 1 insertion(+), 10 deletions(-)
New commits:
commit f4889fa21f7fb99477148dfed7fa40ba583cb63d
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Tue Sep 11 18:23:27 2012 +0200
use _use_static_libraries here again to ensure proper dependency
Change-Id: I04fb35b6eac1c1777e67de9877417cfe7cc5aac8
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1390585..fcc4782 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1918,7 +1918,7 @@ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,orcus/include) \
$$(INCLUDE) \
)
-$(call gb_LinkTarget_use_static_external_library,$(1),orcus,liborcus)
+$(call gb_LinkTarget_use_static_libraries,$(1),orcus)
endef
endif # SYSTEM_LIBORCUS
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 7d54809..96178bc 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -745,15 +745,6 @@ $$(foreach lib,$(2),$$(call
gb_StaticLibrary_get_headers_target,$$(lib)))
endef
-# gb_LinkTarget_use_static_external_library linktarget library externalproject
-define gb_LinkTarget_use_static_external_library
-$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $(2)
-
-$(call gb_LinkTarget_get_target,$(1)) : $(call
gb_ExternalProject_get_target,$(3))
-$(call gb_LinkTarget_get_external_headers_target,$(1)) : $(call
gb_ExternalProject_get_target,$(3))
-
-endef
-
define gb_LinkTarget_add_cobject
$(if $(wildcard $(call gb_CObject_get_source,$(SRCDIR),$(2))),,$(eval $(call
gb_Output_error,No such source file $(call
gb_CObject_get_source,$(SRCDIR),$(2)))))
$(call gb_LinkTarget_get_target,$(1)) : COBJECTS += $(2)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
