[mutter/wip/carlosg/backendless-clutter: 40/41] clutter: Remove leftovers from backend code in build system




commit 03e2cf30a052bc37c4f1c352762efe8da1c7bd67
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue May 11 01:11:55 2021 +0200

    clutter: Remove leftovers from backend code in build system

 clutter/clutter/clutter-build-config.h.meson |  6 ------
 clutter/clutter/clutter-config.h.in          |  6 ------
 clutter/clutter/clutter-main.c               |  1 -
 clutter/clutter/clutter.h                    |  1 -
 clutter/clutter/meson.build                  | 19 -------------------
 5 files changed, 33 deletions(-)
---
diff --git a/clutter/clutter/clutter-build-config.h.meson b/clutter/clutter/clutter-build-config.h.meson
index db77698c35..7ca19deabf 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
index ebf523d1d0..2d801cf07b 100644
--- a/clutter/clutter/clutter-config.h.in
+++ b/clutter/clutter/clutter-config.h.in
@@ -10,12 +10,6 @@
 G_BEGIN_DECLS
 
 #mesondefine CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT
-#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
 
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index 493b286c05..83c6ea0cad 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 9b97cfc9e9..b93cc8e1c2 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 b1e4be999a..25962aa54e 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -229,9 +229,6 @@ clutter_deprecated_headers = [
   'deprecated/clutter-timeline.h',
 ]
 
-clutter_backend_sources = []
-clutter_backend_nonintrospected_sources = []
-clutter_backend_headers = []
 clutter_backend_private_headers = []
 
 if have_wayland
@@ -274,8 +271,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(
@@ -290,16 +285,6 @@ cdata = configuration_data()
 if have_wayland
   cdata.set10('CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT', true)
 endif
-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',
@@ -339,10 +324,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,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]