summaryrefslogtreecommitdiff
path: root/external/hyphen
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-24 17:23:29 +0200
committerMichael Stahl <mstahl@redhat.com>2013-10-24 17:56:07 +0200
commitccf4f1d80e82b2fa5156f1a351a5e1cd8dde3be0 (patch)
treed0805225f54867cf166f26a8ea0b290648db198e /external/hyphen
parentd1f46c8a3f25370a8cb5b360cd23835e693a906c (diff)
hyphen: stop building hyph_en_US.dic too
Change-Id: I05929be5dbc41ba6889bd593ad0ce0061367ea37
Diffstat (limited to 'external/hyphen')
-rw-r--r--external/hyphen/ExternalProject_hyphen.mk1
-rw-r--r--external/hyphen/Module_hyphen.mk13
2 files changed, 8 insertions, 6 deletions
diff --git a/external/hyphen/ExternalProject_hyphen.mk b/external/hyphen/ExternalProject_hyphen.mk
index e7d36730fd70..573fbae00de0 100644
--- a/external/hyphen/ExternalProject_hyphen.mk
+++ b/external/hyphen/ExternalProject_hyphen.mk
@@ -22,7 +22,6 @@ $(call gb_ExternalProject_get_state_target,hyphen,build):
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
$(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \
&& $(MAKE) \
- $(if $(filter YESYES,$(SYSTEM_HYPH)$(WITH_MYSPELL_DICTS)),hyph_en_US.dic) \
)
# vim: set noet sw=4 ts=4:
diff --git a/external/hyphen/Module_hyphen.mk b/external/hyphen/Module_hyphen.mk
index 1dde6dd2126e..80dae1f219ed 100644
--- a/external/hyphen/Module_hyphen.mk
+++ b/external/hyphen/Module_hyphen.mk
@@ -9,23 +9,26 @@
$(eval $(call gb_Module_Module,hyphen))
-ifneq ($(or $(filter NO,$(SYSTEM_HYPH)),$(filter TRUE,$(WITH_MYSPELL_DICTS))),)
+ifeq ($(SYSTEM_HYPH),NO)
+
$(eval $(call gb_Module_add_targets,hyphen,\
UnpackedTarball_hyphen \
))
+
ifeq ($(COM),MSC)
-ifeq ($(SYSTEM_HYPH),NO)
$(eval $(call gb_Module_add_targets,hyphen,\
StaticLibrary_hyphen \
))
-endif
else
+
$(eval $(call gb_Module_add_targets,hyphen,\
ExternalProject_hyphen \
))
-endif
-endif
+
+endif # $(COM)
+
+endif # $(SYSTEM_HYPH)
# vim: set noet sw=4 ts=4: