RepositoryExternal.mk | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 7a030393a022622ab2179034332b55da0eb4783b
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Mon Oct 29 23:29:37 2012 +0100
add more missing use_unpacked
Change-Id: I92395d5883ce862f1dca7b88aa4291a9608c1a52
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ab76d7d..23f14ad 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -357,9 +357,10 @@ define gb_LinkTarget__use_hunspell
$(call gb_LinkTarget_add_defs,$(1),\
-DHUNSPELL_STATIC \
)
+$(call gb_LinkTarget_use_unpacked,$(1),hunspell)
$(call gb_LinkTarget_set_include,$(1),\
- $$(INCLUDE) \
-I$(call gb_UnpackedTarball_get_dir,hunspell/src/hunspell)\
+ $$(INCLUDE) \
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
hunspell \
@@ -661,6 +662,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
))
define gb_LinkTarget__use_neon
+$(call gb_LinkTarget_use_unpacked,$(1),neon)
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,neon/src) \
$$(INCLUDE) \
@@ -832,6 +834,7 @@ $(eval $(call
gb_Helper_register_static_libraries,PLAINLIBS, \
graphite \
))
define gb_LinkTarget__use_graphite
+$(call gb_LinkTarget_use_unpacked,$(1),graphite)
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,graphite/include) \
$$(INCLUDE) \
@@ -1621,6 +1624,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,
\
))
define gb_LinkTarget__use_curl
+$(call gb_LinkTarget_use_unpacked,$(1),curl)
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,curl/include) \
$$(INCLUDE) \
@@ -1807,14 +1811,12 @@ $(eval $(call
gb_Helper_register_static_libraries,PLAINLIBS,\
))
define gb_LinkTarget__use_openldap
-
+$(call gb_LinkTarget_use_unpacked,$(1),openldap)
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,openldap/include) \
$$(INCLUDE) \
)
-
$(call gb_LinkTarget_use_package,$(1),openldap)
-
$(call gb_LinkTarget_use_static_libraries,$(1),\
ldap \
lber \
@@ -2181,6 +2183,7 @@ $(eval $(call
gb_Helper_register_static_libraries,PLAINLIBS,\
))
define gb_LinkTarget__use_orcus
+$(call gb_LinkTarget_use_unpacked,$(1),orcus)
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,orcus/include) \
$$(INCLUDE) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
