diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-17 11:23:19 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-17 11:39:28 +0100 |
| commit | 32a617d8f00636d5cf660577c8cd47633b0bcd7e (patch) | |
| tree | 9862e4392869a6c4138be831ba421b326495cd1c | |
| parent | f70343bbbb2dd1160edace1a2f457fb3b33a7322 (diff) | |
move external packages registration to RepositoryExternal.mk
(with condition from configure.ac for cairo)
Change-Id: I7f4864a7f331f1a3da9c796b51f4e16c58382580
| -rw-r--r-- | Repository.mk | 9 | ||||
| -rw-r--r-- | RepositoryExternal.mk | 21 |
2 files changed, 21 insertions, 9 deletions
diff --git a/Repository.mk b/Repository.mk index 79afd37e4f7c..87916df177e0 100644 --- a/Repository.mk +++ b/Repository.mk @@ -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 \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 23d5a6a57c21..1133bb9e274b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -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),\ |