[mutter/wip/carlosg/input-in-backends: 15/20] backends: Move nested stage to src/backends/x11/nested

[Carlos Garnacho <carlosg src gnome org>]

commit ce11f9ea54a74be936f0278a984273f2fab8e802
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Mar 29 21:18:07 2019 +0100

    backends: Move nested stage to src/backends/x11/nested
    
    We now have a MetaStageX11, so it's extra confusing to have both in
    the same directory.

 src/backends/x11/meta-clutter-backend-x11.c           | 2 +-
 src/backends/x11/{ => nested}/meta-stage-x11-nested.c | 2 +-
 src/backends/x11/{ => nested}/meta-stage-x11-nested.h | 2 +-
 src/meson.build                                       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/backends/x11/meta-clutter-backend-x11.c b/src/backends/x11/meta-clutter-backend-x11.c
index 0c6e082c9..6e51c48ca 100644
--- a/src/backends/x11/meta-clutter-backend-x11.c
+++ b/src/backends/x11/meta-clutter-backend-x11.c
@@ -31,8 +31,8 @@
 #include "backends/x11/meta-clutter-backend-x11.h"
 #include "backends/x11/meta-device-manager-x11.h"
 #include "backends/x11/meta-keymap-x11.h"
-#include "backends/x11/meta-stage-x11-nested.h"
 #include "backends/x11/meta-xkb-a11y-x11.h"
+#include "backends/x11/nested/meta-stage-x11-nested.h"
 #include "clutter/clutter-mutter.h"
 #include "clutter/clutter.h"
 #include "core/bell.h"
diff --git a/src/backends/x11/meta-stage-x11-nested.c b/src/backends/x11/nested/meta-stage-x11-nested.c
similarity index 99%
rename from src/backends/x11/meta-stage-x11-nested.c
rename to src/backends/x11/nested/meta-stage-x11-nested.c
index f6dc5dbcb..73b8f2854 100644
--- a/src/backends/x11/meta-stage-x11-nested.c
+++ b/src/backends/x11/nested/meta-stage-x11-nested.c
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "backends/x11/meta-stage-x11-nested.h"
+#include "backends/x11/nested/meta-stage-x11-nested.h"
 
 #include "backends/meta-backend-private.h"
 #include "backends/meta-crtc.h"
diff --git a/src/backends/x11/meta-stage-x11-nested.h b/src/backends/x11/nested/meta-stage-x11-nested.h
similarity index 96%
rename from src/backends/x11/meta-stage-x11-nested.h
rename to src/backends/x11/nested/meta-stage-x11-nested.h
index b605e07e2..76678465b 100644
--- a/src/backends/x11/meta-stage-x11-nested.h
+++ b/src/backends/x11/nested/meta-stage-x11-nested.h
@@ -26,7 +26,7 @@
 #define META_STAGE_X11_NESTED_H
 
 #include "clutter/clutter-mutter.h"
-#include "meta-stage-x11.h"
+#include "backends/x11/meta-stage-x11.h"
 
 #define META_TYPE_STAGE_X11_NESTED (meta_stage_x11_nested_get_type ())
 G_DECLARE_FINAL_TYPE (MetaStageX11Nested, meta_stage_x11_nested,
diff --git a/src/meson.build b/src/meson.build
index ebdadcf7f..a3e0c1ccb 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -264,8 +264,6 @@ mutter_sources = [
   'backends/x11/meta-renderer-x11.h',
   'backends/x11/meta-stage-x11.c',
   'backends/x11/meta-stage-x11.h',
-  'backends/x11/meta-stage-x11-nested.c',
-  'backends/x11/meta-stage-x11-nested.h',
   'backends/x11/meta-virtual-input-device-x11.c',
   'backends/x11/meta-virtual-input-device-x11.h',
   'backends/x11/meta-xkb-a11y-x11.c',
@@ -274,6 +272,8 @@ mutter_sources = [
   'backends/x11/nested/meta-backend-x11-nested.h',
   'backends/x11/nested/meta-cursor-renderer-x11-nested.c',
   'backends/x11/nested/meta-cursor-renderer-x11-nested.h',
+  'backends/x11/nested/meta-stage-x11-nested.c',
+  'backends/x11/nested/meta-stage-x11-nested.h',
   'backends/x11/nested/meta-renderer-x11-nested.c',
   'backends/x11/nested/meta-renderer-x11-nested.h',
   'compositor/clutter-utils.c',