diff options
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | RepositoryExternal.mk | 22 | ||||
| -rw-r--r-- | lingucomponent/Library_lnth.mk | 5 | ||||
| -rw-r--r-- | mythes/Module_mythes.mk | 3 |
4 files changed, 24 insertions, 7 deletions
diff --git a/Repository.mk b/Repository.mk index e6bda3329362..ed4a0fbae869 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 77be1e7324c6..7916fc243ca9 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 608c4213d7be..9615d5a20655 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 da7b14d10aee..7a210c02d933 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 |