strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move external packages registration to RepositoryExternal.mk

Browse source 
(with condition from configure.ac for cairo)

Change-Id: I7f4864a7f331f1a3da9c796b51f4e16c58382580
This commit is contained in:
Michael Stahl 2014-02-17 11:23:19 +01:00
parent f70343bbbb
commit 32a617d8f0
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Repository.mk
View file

@ -706,15 +706,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
) \
))
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
$(if $(SYSTEM_CURL),,curl) \
$(if $(SYSTEM_LCMS2),,lcms2) \
$(if $(SYSTEM_LIBXSLT),,xslt) \
$(if $(SYSTEM_CAIRO),,cairo \
$(if $(filter $(OS),WNT),,pixman) \
) \
))
# External executables
$(eval $(call gb_ExternalExecutable_register_executables,\
genbrk \

21
RepositoryExternal.mk
View file

@ -871,6 +871,10 @@ endef
else # !SYSTEM_LIBXSLT
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
xslt \
))
define gb_LinkTarget__use_libxslt
$(call gb_LinkTarget_use_package,$(1),xslt)
$(call gb_LinkTarget_set_include,$(1),\
@ -1073,6 +1077,8 @@ endif # ANDROID
endif # SYSTEM_REDLAND
ifneq ($(filter unx,$(GUIBASE))$(ENABLE_CAIRO_CANVAS),) # or
ifneq ($(SYSTEM_CAIRO),)
define gb_LinkTarget__use_cairo
@ -1087,6 +1093,11 @@ endef
else # !SYSTEM_CAIRO
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
cairo \
$(if $(filter $(OS),WNT),,pixman) \
))
define gb_LinkTarget__use_cairo
$(call gb_LinkTarget_use_package,$(1),cairo)
$(call gb_LinkTarget_use_package,$(1),pixman)
@ -1107,6 +1118,8 @@ endef
endif # SYSTEM_CAIRO
endif # CAIRO
ifneq ($(SYSTEM_FREETYPE),)
define gb_LinkTarget__use_freetype_headers
@ -1810,6 +1823,10 @@ gb_ExternalProject__use_lcms2 :=
else # !SYSTEM_LCMS2
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
lcms2 \
))
define gb_ExternalProject__use_lcms2
$(call gb_ExternalProject_use_package,$(1),lcms2)
@ -2093,6 +2110,10 @@ endef
else # !SYSTEM_CURL
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
curl \
))
define gb_LinkTarget__use_curl
$(call gb_LinkTarget_use_package,$(1),curl)
$(call gb_LinkTarget_set_include,$(1),\