Library_merged.mk | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
New commits:
commit 81728bed9b82300875b156affa9aa55e5afa80e4
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Mar 23 16:14:49 2013 -0400
cleanup Library_merged
Change-Id: Iedd2a60ab6287ed661de7a88daf182cf2af4fe86
diff --git a/Library_merged.mk b/Library_merged.mk
index 3684bd8..1e190b6 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -75,15 +75,13 @@ ifeq ($(OS),ANDROID)
$(eval $(call gb_Library_use_externals,merged,\
hunspell \
expat_utf8 \
+ mythes \
+ hyphen \
))
$(eval $(call gb_Library_use_static_libraries,merged,\
sax_shared \
ulingu \
))
-$(eval $(call gb_Library_add_libs,merged,\
- $(if $(filter MSC,$(COM)),libmythes.lib,-lmythes-1.2) \
- $(if $(filter MSC,$(COM)),hyphen.lib,-lhyphen) \
-))
endif
ifeq ($(ENABLE_GRAPHITE),TRUE)
@@ -183,12 +181,6 @@ $(eval $(call
gb_Library_use_system_darwin_frameworks,merged,\
))
endif
-ifneq ($(ENABLE_LIBRSVG),NO)
-$(eval $(call gb_Library_use_externals,merged,\
- cairo \
-))
-endif
-
ifeq ($(ENABLE_TELEPATHY),TRUE)
$(eval $(call gb_Library_use_externals,merged,\
gtk \
commit f380dd4a7c53184ffb4021a70172e4828cd1b214
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Mar 23 13:05:50 2013 -0400
remove executable bits
Change-Id: I77293df49ccb6d86085351a1b9ee1f0e19d52fdf
diff --git a/solenv/Executable_g++-wrapper.mk b/solenv/Executable_g++-wrapper.mk
old mode 100755
new mode 100644
diff --git a/solenv/StaticLibrary_wrapper.mk b/solenv/StaticLibrary_wrapper.mk
old mode 100755
new mode 100644
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
