isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Remove leftovers from backend code in build system

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1862>
This commit is contained in:
Carlos Garnacho 2021-05-11 01:11:55 +02:00
parent 229b52872e
commit 1f67e4650c
6 changed files with 0 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/clutter/clutter-backend.h
View File

@ -33,7 +33,6 @@
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include <clutter/clutter-config.h>
#include <clutter/clutter-keymap.h> #include <clutter/clutter-keymap.h>
#include <clutter/clutter-types.h> #include <clutter/clutter-types.h>
#include <clutter/clutter-seat.h> #include <clutter/clutter-seat.h>

6
clutter/clutter/clutter-build-config.h.meson
View File

@ -4,11 +4,5 @@
/* List of Cogl drivers */ /* List of Cogl drivers */
#mesondefine CLUTTER_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 */ /* Supports PangoFt2 */
#mesondefine HAVE_PANGO_FT2 #mesondefine HAVE_PANGO_FT2

21
clutter/clutter/clutter-config.h.in
View File

@ -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__ */

1
clutter/clutter/clutter-main.c
View File

@ -53,7 +53,6 @@
#include "clutter-actor-private.h" #include "clutter-actor-private.h"
#include "clutter-backend-private.h" #include "clutter-backend-private.h"
#include "clutter-config.h"
#include "clutter-debug.h" #include "clutter-debug.h"
#include "clutter-event-private.h" #include "clutter-event-private.h"
#include "clutter-feature.h" #include "clutter-feature.h"

1
clutter/clutter/clutter.h
View File

@ -28,7 +28,6 @@
#define __CLUTTER_H_INSIDE__ #define __CLUTTER_H_INSIDE__
#include "clutter-config.h"
#include "clutter-types.h" #include "clutter-types.h"
#include "clutter-action.h" #include "clutter-action.h"

30
clutter/clutter/meson.build
View File

@ -231,9 +231,6 @@ clutter_deprecated_headers = [
'deprecated/clutter-timeline.h', 'deprecated/clutter-timeline.h',
] ]
clutter_backend_sources = []
clutter_backend_nonintrospected_sources = []
clutter_backend_headers = []
clutter_backend_private_headers = [] clutter_backend_private_headers = []
cally_headers = [ cally_headers = [
@ -269,8 +266,6 @@ clutter_built_private_headers = []
cdata = configuration_data() cdata = configuration_data()
cdata.set_quoted('MUTTER_VERSION', meson.project_version()) cdata.set_quoted('MUTTER_VERSION', meson.project_version())
cdata.set('CLUTTER_DRIVERS', '"*"') 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) cdata.set('HAVE_PANGO_FT2', have_pango_ft2)
clutter_build_config_h = configure_file( clutter_build_config_h = configure_file(
@ -281,27 +276,6 @@ clutter_build_config_h = configure_file(
) )
clutter_built_private_headers += clutter_build_config_h 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', clutter_enum_types = gnome.mkenums('clutter-enum-types',
sources: [clutter_headers, clutter_deprecated_headers], sources: [clutter_headers, clutter_deprecated_headers],
c_template: 'clutter-enum-types.c.in', c_template: 'clutter-enum-types.c.in',
@ -331,10 +305,6 @@ libmutter_clutter = shared_library(libmutter_clutter_name,
clutter_private_headers, clutter_private_headers,
clutter_nonintrospected_sources, clutter_nonintrospected_sources,
clutter_deprecated_headers, clutter_deprecated_headers,
clutter_backend_sources,
clutter_backend_nonintrospected_sources,
clutter_backend_headers,
clutter_backend_private_headers,
clutter_built_sources, clutter_built_sources,
clutter_built_headers, clutter_built_headers,
cally_sources, cally_sources,