From 1f67e4650c82e0fc2b4befcc356a95bc1f35a09b Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 11 May 2021 01:11:55 +0200
Subject: [PATCH] clutter: Remove leftovers from backend code in build system

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1862>
---
 clutter/clutter/clutter-backend.h            |  1 -
 clutter/clutter/clutter-build-config.h.meson |  6 ----
 clutter/clutter/clutter-config.h.in          | 21 --------------
 clutter/clutter/clutter-main.c               |  1 -
 clutter/clutter/clutter.h                    |  1 -
 clutter/clutter/meson.build                  | 30 --------------------
 6 files changed, 60 deletions(-)
 delete mode 100644 clutter/clutter/clutter-config.h.in

diff --git a/clutter/clutter/clutter-backend.h b/clutter/clutter/clutter-backend.h
index 14f6c24d4..570fd96a4 100644
--- a/clutter/clutter/clutter-backend.h
+++ b/clutter/clutter/clutter-backend.h
@@ -33,7 +33,6 @@
 
 #include <cogl/cogl.h>
 
-#include <clutter/clutter-config.h>
 #include <clutter/clutter-keymap.h>
 #include <clutter/clutter-types.h>
 #include <clutter/clutter-seat.h>
diff --git a/clutter/clutter/clutter-build-config.h.meson b/clutter/clutter/clutter-build-config.h.meson
index db77698c3..7ca19deab 100644
--- a/clutter/clutter/clutter-build-config.h.meson
+++ b/clutter/clutter/clutter-build-config.h.meson
@@ -4,11 +4,5 @@
 /* List of Cogl drivers */
 #mesondefine CLUTTER_DRIVERS
 
-/* Have evdev support for input handling */
-#mesondefine HAVE_EVDEV
-
-/* Building with libwacom for advanced tablet management */
-#mesondefine HAVE_LIBWACOM
-
 /* Supports PangoFt2 */
 #mesondefine HAVE_PANGO_FT2
diff --git a/clutter/clutter/clutter-config.h.in b/clutter/clutter/clutter-config.h.in
deleted file mode 100644
index b3057f4ae..000000000
--- a/clutter/clutter/clutter-config.h.in
+++ /dev/null
@@ -1,21 +0,0 @@
-#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only <clutter/clutter.h> can be included directly."
-#endif
-
-#ifndef __CLUTTER_CONFIG_H__
-#define __CLUTTER_CONFIG_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-#mesondefine CLUTTER_WINDOWING_X11
-#mesondefine CLUTTER_INPUT_X11
-#mesondefine CLUTTER_WINDOWING_GLX
-#mesondefine CLUTTER_WINDOWING_EGL
-#mesondefine CLUTTER_INPUT_EVDEV
-#mesondefine CLUTTER_INPUT_NULL
-
-G_END_DECLS
-
-#endif /* __CLUTTER_CONFIG_H__ */
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index b75ef7878..b862f82a3 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -53,7 +53,6 @@
 
 #include "clutter-actor-private.h"
 #include "clutter-backend-private.h"
-#include "clutter-config.h"
 #include "clutter-debug.h"
 #include "clutter-event-private.h"
 #include "clutter-feature.h"
diff --git a/clutter/clutter/clutter.h b/clutter/clutter/clutter.h
index 4cc4fc52b..8eefead61 100644
--- a/clutter/clutter/clutter.h
+++ b/clutter/clutter/clutter.h
@@ -28,7 +28,6 @@
 
 #define __CLUTTER_H_INSIDE__
 
-#include "clutter-config.h"
 #include "clutter-types.h"
 
 #include "clutter-action.h"
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index 4f6742e71..fee76438b 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -231,9 +231,6 @@ clutter_deprecated_headers = [
   'deprecated/clutter-timeline.h',
 ]
 
-clutter_backend_sources = []
-clutter_backend_nonintrospected_sources = []
-clutter_backend_headers = []
 clutter_backend_private_headers = []
 
 cally_headers = [
@@ -269,8 +266,6 @@ clutter_built_private_headers = []
 cdata = configuration_data()
 cdata.set_quoted('MUTTER_VERSION', meson.project_version())
 cdata.set('CLUTTER_DRIVERS', '"*"')
-cdata.set('HAVE_EVDEV', have_native_backend)
-cdata.set('HAVE_LIBWACOM', have_libwacom)
 cdata.set('HAVE_PANGO_FT2', have_pango_ft2)
 
 clutter_build_config_h = configure_file(
@@ -281,27 +276,6 @@ clutter_build_config_h = configure_file(
 )
 clutter_built_private_headers += clutter_build_config_h
 
-cdata = configuration_data()
-if have_x11
-  cdata.set_quoted('CLUTTER_WINDOWING_X11', 'x11')
-  cdata.set_quoted('CLUTTER_INPUT_X11', 'x11')
-  cdata.set_quoted('CLUTTER_WINDOWING_GLX', 'glx')
-endif
-if have_native_backend
-  cdata.set_quoted('CLUTTER_WINDOWING_EGL', 'eglnative')
-  cdata.set_quoted('CLUTTER_INPUT_EVDEV', 'evdev')
-endif
-cdata.set_quoted('CLUTTER_INPUT_NULL', 'null')
-
-clutter_config_h = configure_file(
-  input: 'clutter-config.h.in',
-  output: 'clutter-config.h',
-  configuration: cdata,
-  install: true,
-  install_dir: clutter_clutter_includedir,
-)
-clutter_built_headers += clutter_config_h
-
 clutter_enum_types = gnome.mkenums('clutter-enum-types',
   sources: [clutter_headers, clutter_deprecated_headers],
   c_template: 'clutter-enum-types.c.in',
@@ -331,10 +305,6 @@ libmutter_clutter = shared_library(libmutter_clutter_name,
     clutter_private_headers,
     clutter_nonintrospected_sources,
     clutter_deprecated_headers,
-    clutter_backend_sources,
-    clutter_backend_nonintrospected_sources,
-    clutter_backend_headers,
-    clutter_backend_private_headers,
     clutter_built_sources,
     clutter_built_headers,
     cally_sources,