diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-24 14:35:18 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-24 16:52:01 +0200 |
| commit | 962771f7d5c353fa861fce4b5a3a612a1d76bca5 (patch) | |
| tree | d1862f9e2116fb2805ef6a33cec38c31aeb57b7c /RepositoryExternal.mk | |
| parent | 4eb68428f676121340bb1533742635f28081e26a (diff) | |
stop delivering freetype headers
Change-Id: I8e14cc411520272969cfd24048e403b9fd53cde4
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 4a2ac5dcd239..3ce5a4166892 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -994,13 +994,12 @@ endif # SYSTEM_REDLAND ifeq ($(SYSTEM_CAIRO),YES) -# FREETYPE_CLAGS from environment if ENABLE_CAIRO is used define gb_LinkTarget__use_cairo $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - $(FREETYPE_CFLAGS) \ $(CAIRO_CFLAGS) \ ) +$(call gb_LinkTarget_use_external,$(1),freetype_headers) $(call gb_LinkTarget_add_libs,$(1),$(CAIRO_LIBS)) endef @@ -1017,10 +1016,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ define gb_LinkTarget__use_cairo $(call gb_LinkTarget_use_package,$(1),cairo) $(call gb_LinkTarget_use_package,$(1),pixman) +$(call gb_LinkTarget_use_external,$(1),freetype_headers) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,cairo) \ -I$(call gb_UnpackedTarball_get_dir,cairo)/src \ - $(FREETYPE_CFLAGS) \ $$(INCLUDE) \ ) $(call gb_LinkTarget_use_libraries,$(1),\ @@ -1034,20 +1033,38 @@ endef endif # SYSTEM_CAIRO -define gb_LinkTarget__use_freetype +ifeq ($(SYSTEM_FREETYPE),YES) + +define gb_LinkTarget__use_freetype_headers $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(FREETYPE_CFLAGS) \ ) -ifneq ($(OS),ANDROID) +endef + +define gb_LinkTarget__use_freetype +$(call gb_LinkTarget_use_external,$(1),freetype_headers) $(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS)) -else + +endef + +else # ! SYSTEM_FREETYPE + +define gb_LinkTarget__use_freetype_headers +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,freetype)/include \ + $$(INCLUDE) \ +) + +define gb_LinkTarget__use_freetype +$(call gb_LinkTarget_use_external,$(1),freetype_headers) $(call gb_LinkTarget_use_static_libraries,$(1),freetype) -endif endef +endif # SYSTEM_FREETYPE + ifeq ($(SYSTEM_FONTCONFIG),YES) define gb_LinkTarget__use_fontconfig |