diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-01-18 20:14:54 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-01-19 13:55:08 +0100 |
| commit | c18d3f8823a00edcd3dacec4f2052302ab6a70ee (patch) | |
| tree | 941231cf862b7cdcb99ac8c5637a9efaf759e6f0 /officecfg | |
| parent | 6f5186a94dcd1989cdd819e35163af0542912559 (diff) | |
add --disable-librelogo to disable LibreLogo at build time
Annoyingly the packinfo_*.txt don't support conditionals but we can
work-around that with a little duplication.
Change-Id: Id00a6831effcc63a917fc21d2cd201474fdb559d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109569
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/Configuration_officecfg.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index af9884d91262..dc8802628451 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -72,7 +72,9 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/Office/Accelerators-macosx.xcu \ org/openoffice/Office/Accelerators-reportbuilder.xcu \ org/openoffice/Office/Accelerators-unxwnt.xcu \ - org/openoffice/Office/Addons-librelogo.xcu \ + $(call gb_Helper_optional,LIBRELOGO, \ + org/openoffice/Office/Addons-librelogo.xcu \ + ) \ org/openoffice/Office/Common-writer.xcu \ org/openoffice/Office/Common-calc.xcu \ org/openoffice/Office/Common-draw.xcu \ @@ -111,8 +113,10 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/Office/Embedding-base.xcu \ org/openoffice/Office/Embedding-reportbuilder.xcu \ org/openoffice/Office/Embedding-writer.xcu \ - org/openoffice/Office/UI/WriterCommands-librelogo.xcu \ - org/openoffice/Office/UI/WriterWindowState-librelogo.xcu \ + $(call gb_Helper_optional,LIBRELOGO, \ + org/openoffice/Office/UI/WriterCommands-librelogo.xcu \ + org/openoffice/Office/UI/WriterWindowState-librelogo.xcu \ + ) \ org/openoffice/Office/UI/Controller-reportbuilder.xcu \ org/openoffice/TypeDetection/UISort-writer.xcu \ org/openoffice/TypeDetection/UISort-calc.xcu \ @@ -132,7 +136,9 @@ $(eval $(call gb_Configuration_add_spool_langpack,registry,officecfg/registry/da $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\ org/openoffice/Setup.xcu \ org/openoffice/Office/Accelerators.xcu \ - org/openoffice/Office/Addons.xcu \ + $(call gb_Helper_optional,LIBRELOGO, \ + org/openoffice/Office/Addons.xcu \ + ) \ org/openoffice/Office/Common.xcu \ org/openoffice/Office/DataAccess.xcu \ org/openoffice/Office/PresentationMinimizer.xcu \ |