Repository.mk | 1 -
RepositoryExternal.mk | 22 ++++++++++++++++++++++
lingucomponent/Library_lnth.mk | 5 +----
mythes/Module_mythes.mk | 3 +--
4 files changed, 24 insertions(+), 7 deletions(-)
New commits:
commit 1d1bab408421030cb260d67a519d478db87bdff5
Author: Peter Foley <pefol...@verizon.net>
Date: Sun Oct 28 12:00:06 2012 -0400
fixup gbuildified mythes
Change-Id: I3a31c7c9ff66e2b6a13b22dce85854777b66355e
diff --git a/Repository.mk b/Repository.mk
index e6bda33..ed4a0fb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -654,7 +654,6 @@ $(eval $(call
gb_Helper_register_static_libraries,PLAINLIBS, \
findsofficepath \
headless \
libeay32 \
- mythes \
npsoenv \
nputils \
pdfimport_s \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 77be1e7..7916fc2 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -240,6 +240,28 @@ endef
endif # SYSTEM_JPEG
+ifeq ($(SYSTEM_MYTHES),YES)
+
+define gb_LinkTarget__use_mythes
+endef
+
+else # !SYSTEM_MYTHES
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ mythes \
+))
+
+define gb_LinkTarget__use_mythes
+$(call gb_LinkTarget_use_package,$(1),\
+ mythes \
+)
+$(call gb_LinkTarget_add_libs,\
+ $(if $(filter MSC,$(COM)),libmythes.lib,-lmythes-1.2) \
+)
+endef
+
+endif # SYSTEM_MYTHES
+
ifeq ($(SYSTEM_EXPAT),YES)
diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk
index 608c421..9615d5a 100644
--- a/lingucomponent/Library_lnth.mk
+++ b/lingucomponent/Library_lnth.mk
@@ -54,10 +54,7 @@ $(eval $(call gb_Library_use_static_libraries,lnth,\
$(eval $(call gb_Library_use_externals,lnth,\
hunspell \
-))
-
-$(eval $(call gb_Library_add_libs,lnth,\
- $(if $(filter MSC,$(COM)),libmythes.lib,-lmythes-1.2) \
+ mythes \
))
$(eval $(call gb_Library_add_exception_objects,lnth,\
diff --git a/mythes/Module_mythes.mk b/mythes/Module_mythes.mk
index da7b14d..7a210c0 100644
--- a/mythes/Module_mythes.mk
+++ b/mythes/Module_mythes.mk
@@ -12,15 +12,14 @@ $(eval $(call gb_Module_Module,mythes))
ifeq ($(SYSTEM_MYTHES),NO)
$(eval $(call gb_Module_add_targets,mythes,\
UnpackedTarball_mythes \
+ ExternalPackage_mythes \
))
ifeq ($(COM),MSC)
$(eval $(call gb_Module_add_targets,mythes,\
- ExternalPackage_mythes \
StaticLibrary_mythes \
))
else
$(eval $(call gb_Module_add_targets,mythes,\
- ExternalPackage_mythes \
ExternalProject_mythes \
))
endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
