move HAVE_FEATURE_DESKTOP/OPENCL to their dedicated headers

HAVE_FEATURE_OPENCL is included by a common Calc header
and HAVE_FEATURE_DESKTOP is included by a common Writer header,
causing pretty much their full rebuilds if any feature changes.

Change-Id: If29bf78bd4fd70b37981e0826a577777fd255c89
Reviewed-on: https://gerrit.libreoffice.org/80776
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>

3 files changed, 41 insertions, 27 deletions

diff --git a/config_host/config_feature_desktop.h.in b/config_host/config_feature_desktop.h.in
new file mode 100644
index 000000000000..489f684afead
--- /dev/null
+++ b/config_host/config_feature_desktop.h.in
@@ -0,0 +1,28 @@
+/* A feature split out from config_features.h because it affects many files.
+ */
+
+#ifndef CONFIG_FEATURE_DESKTOP_H
+#define CONFIG_FEATURE_DESKTOP_H
+
+/* DESKTOP - Whether we have a "normal" desktop UI or not.
+ *
+ * Non-DESKTOP in practice means touch-based mobile devices, Android
+ * or iOS for now. Support for those is work in progress.
+ *
+ * Non-DESKTOP implies that the OS makes sure that only one instance
+ * of each LibreOffice-based "app" at a time can be running, and thus
+ * the LibreOffice code does not need to handle such things itself.
+ *
+ * Non-DESKTOP implies no traditional inter-app drag and drop concept.
+ *
+ * Non-DESKTOP implies no traditional help mechanism, and to some
+ * extent (as noticed, and as possible without making the code too
+ * ugly) the related code is ifdeffed out.
+ *
+ * Non-DESKTOP implies no traditional desktop-style GUI elements like
+ * toolbars and scrollbars presented by the LO code.
+ */
+
+#define HAVE_FEATURE_DESKTOP 0
+
+#endif
diff --git a/config_host/config_feature_opencl.h.in b/config_host/config_feature_opencl.h.in
new file mode 100644
index 000000000000..637c15a0837b
--- /dev/null
+++ b/config_host/config_feature_opencl.h.in
@@ -0,0 +1,13 @@
+/* A feature split out from config_features.h because it affects many files.
+ */
+
+#ifndef CONFIG_FEATURE_OPENCL_H
+#define CONFIG_FEATURE_OPENCL_H
+
+/*
+ * Whether OpenCL is usable on the platform and we should compile in use of OpenCL.
+ */
+
+#define HAVE_FEATURE_OPENCL 0
+
+#endif
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index a68050111457..90536560c0b4 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -7,27 +7,6 @@
 #ifndef CONFIG_FEATURES_H
 #define CONFIG_FEATURES_H
 
-/* DESKTOP - Whether we have a "normal" desktop UI or not.
- *
- * Non-DESKTOP in practice means touch-based mobile devices, Android
- * or iOS for now. Support for those is work in progress.
- *
- * Non-DESKTOP implies that the OS makes sure that only one instance
- * of each LibreOffice-based "app" at a time can be running, and thus
- * the LibreOffice code does not need to handle such things itself.
- *
- * Non-DESKTOP implies no traditional inter-app drag and drop concept.
- *
- * Non-DESKTOP implies no traditional help mechanism, and to some
- * extent (as noticed, and as possible without making the code too
- * ugly) the related code is ifdeffed out.
- *
- * Non-DESKTOP implies no traditional desktop-style GUI elements like
- * toolbars and scrollbars presented by the LO code.
- */
-
-#define HAVE_FEATURE_DESKTOP 0
-
 /* X11
  *
  * Whether we are building code to run in an X11 environment.
@@ -73,12 +52,6 @@
 #define HAVE_FEATURE_MULTIUSER_ENVIRONMENT 0
 
 /*
- * Whether OpenCL is usable on the platform and we should compile in use of OpenCL.
- */
-
-#define HAVE_FEATURE_OPENCL 0
-
-/*
  * Whether the OS has Avahi support,
  * This library is used for zeroconf service publication on the local network
  * for the Impress remote control, so that the remote can automatically