l10ntools/StaticLibrary_transex.mk | 5 +++++
solenv/gbuild/platform/android.mk | 10 ----------
2 files changed, 5 insertions(+), 10 deletions(-)
New commits:
commit e5eb833917266cd085e4e9fa5c923f8fcc0da985
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Oct 29 13:41:16 2012 +0100
gbuild: gb_Library_PLAINLIBS_NONE zombie cleanup for android
Change-Id: I4599c252ba1d37e5377e405ac1a0e7bf4e22086a
diff --git a/solenv/gbuild/platform/android.mk
b/solenv/gbuild/platform/android.mk
index 2c33f1b..526c18c 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -13,10 +13,6 @@ gb_STDLIBS := \
-lgnustl_static \
-lm
-gb_Library_PLAINLIBS_NONE := \
- android \
- gnustl_static \
-
else
# Link almost everything with -lgnustl_shared
gb_STDLIBS := \
@@ -72,12 +68,6 @@ gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-gb_Library_PLAINLIBS_NONE += \
- jpeg \
- m \
- pthread \
- z \
-
endif
# Prefix UNO library filenames with "lib"
commit e755317aca5487dbcb35f4eabdaa2041de693797
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Oct 29 13:35:24 2012 +0100
l10ntools: add missing dependency on sal headers
Change-Id: Iced89d43299767a30d31d1c5e3abf3e8c91f76cc
diff --git a/l10ntools/StaticLibrary_transex.mk
b/l10ntools/StaticLibrary_transex.mk
index e8c84b7..b437be9 100644
--- a/l10ntools/StaticLibrary_transex.mk
+++ b/l10ntools/StaticLibrary_transex.mk
@@ -32,6 +32,11 @@ $(eval $(call gb_StaticLibrary_set_include,transex,\
$$(INCLUDE) \
))
+$(eval $(call gb_StaticLibrary_use_packages,transex,\
+ sal_generated \
+ sal_inc \
+))
+
$(eval $(call gb_StaticLibrary_add_exception_objects,transex,\
l10ntools/source/export2 \
l10ntools/source/merge \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
