diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-11-19 14:54:55 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-11-19 14:56:41 +0200 |
| commit | e461f7efcb77ce771835054c22ea0353555d9237 (patch) | |
| tree | 4201bb1c5193d58808fc49d487df3bbbe52d13b7 /RepositoryExternal.mk | |
| parent | a3eec8a043eae4417276938968a5a8e227d23111 (diff) | |
Do use libo_CHECK_SYSTEM_MODULE for GLYPHY after all
Set the CFLAGS and LIBS for it in config_host.mk.in, and handle the
SYSTEM_GLYPHY case properly in RepositoryExternal.mk.
Change-Id: I56a7fe72b675b6dd4514bbd1739b53f5871ed36a
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 42630d0f9911..c87e0e4e12e5 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -274,6 +274,14 @@ endif # SYSTEM_GLEW ifneq ($(SYSTEM_GLYPHY),) +define gb_LinkTarget__use_glyphy +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(GLYPHY_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(GLYPHY_LIBS)) + +endef else # !SYSTEM_GLYPHY $(eval $(call gb_Helper_register_packages_for_install,ooo,\ |