diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-08 06:47:02 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-08 12:26:30 +0100 |
| commit | ed1aa172f8807ee479e4f529df49d19c13a8bc86 (patch) | |
| tree | 61352b390a5be1575d5c07b509b26889187cc90a /Repository.mk | |
| parent | 92a90cf5ccb998d2fcc77a62bb971534e410cdec (diff) | |
Unify condition names and fix "else" paths
Drop Build prefix and settle on Lib and Exe prefixes. Also add a
note about the "else" part of the condition and fix offenders.
While at it, define COND_LIB_SAL_TEXTENC to be used by sal to
prevent diverting coditions in build and cxx code.
Change-Id: I944587ca1ccbe46b765d1a631a7214c8126fe951
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128136
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Repository.mk b/Repository.mk index 2732439165e1..6e3834a24259 100644 --- a/Repository.mk +++ b/Repository.mk @@ -44,7 +44,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ $(if $(filter iOS,$(OS)),LibreOffice) \ lngconvex \ localize \ - $(call gb_CondBuildLockfile,lockfile) \ + $(call gb_CondExeLockfile,lockfile) \ makedepend \ mbsdiff \ osl_process_child \ @@ -147,7 +147,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \ $(call gb_Helper_optional,FUZZERS,dbffuzzer) \ $(if $(filter-out ANDROID HAIKU iOS MACOSX WNT,$(OS)),oosplash) \ soffice_bin \ - $(call gb_CondBuildUnopkg, \ + $(call gb_CondExeUnopkg, \ unopkg_bin \ $(if $(filter WNT,$(OS)), \ unopkg \ @@ -235,7 +235,7 @@ endif $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(if $(and $(ENABLE_JAVA),$(filter-out HAIKU MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \ - $(call gb_CondBuildRegistryTools, \ + $(call gb_CondExeRegistryTools, \ regmerge \ regview \ ) \ @@ -603,7 +603,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \ )) $(eval $(call gb_Helper_register_plugins_for_install,PRIVATELIBS_URE,ure, \ - $(call gb_CondSalTextEncodingLibrary,sal_textenc) \ + $(call gb_CondLibSalTextenc,sal_textenc) \ )) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ @@ -638,7 +638,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(call gb_Helper_optional,XMLHELP,ucpchelp1) \ ucphier1 \ ucppkg1 \ - $(call gb_CondBuildUnopkg,unopkgapp) \ + $(call gb_CondExeUnopkg,unopkgapp) \ xmlsecurity \ xsec_xmlsec \ xstor \ |