[mutter/wayland] Start creating different subdirectories for each backend

[Jasper St. Pierre <jstpierre src gnome org>]

commit bce1d5117b9ec20143c991959c140f11ca6a25bf
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Mar 31 23:25:37 2014 -0400

    Start creating different subdirectories for each backend

 src/Makefile.am                                    |   26 ++++++++++---------
 src/backends/meta-backend.c                        |    2 +-
 src/backends/meta-idle-monitor.c                   |    4 +-
 src/backends/meta-monitor-manager.c                |    4 +-
 .../{ => native}/meta-idle-monitor-native.c        |    0
 .../{ => native}/meta-idle-monitor-native.h        |    0
 .../{ => native}/meta-monitor-manager-kms.c        |    0
 .../{ => native}/meta-monitor-manager-kms.h        |    0
 src/backends/{ => native}/meta-weston-launch.c     |    0
 src/backends/{ => native}/meta-weston-launch.h     |    0
 src/backends/{ => native}/weston-launch.c          |    0
 src/backends/{ => native}/weston-launch.h          |    0
 src/backends/{ => x11}/meta-idle-monitor-xsync.c   |    0
 src/backends/{ => x11}/meta-idle-monitor-xsync.h   |    0
 .../{ => x11}/meta-monitor-manager-xrandr.c        |    0
 .../{ => x11}/meta-monitor-manager-xrandr.h        |    0
 src/core/events.c                                  |    4 +-
 17 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 78c0230..2dff8b2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,23 +62,23 @@ libmutter_wayland_la_SOURCES =                      \
        backends/meta-idle-monitor-private.h    \
        backends/meta-idle-monitor-dbus.c       \
        backends/meta-idle-monitor-dbus.h       \
-       backends/meta-idle-monitor-xsync.c      \
-       backends/meta-idle-monitor-xsync.h      \
-       backends/meta-idle-monitor-native.c     \
-       backends/meta-idle-monitor-native.h     \
-       backends/meta-xrandr-shared.h           \
        backends/meta-monitor-config.c          \
        backends/meta-monitor-config.h          \
        backends/meta-monitor-manager.c         \
        backends/meta-monitor-manager.h         \
        backends/meta-monitor-manager-dummy.c   \
        backends/meta-monitor-manager-dummy.h   \
-       backends/meta-monitor-manager-kms.c     \
-       backends/meta-monitor-manager-kms.h     \
-       backends/meta-monitor-manager-xrandr.c  \
-       backends/meta-monitor-manager-xrandr.h  \
-       backends/meta-weston-launch.c           \
-       backends/meta-weston-launch.h           \
+       backends/native/meta-idle-monitor-native.c      \
+       backends/native/meta-idle-monitor-native.h      \
+       backends/native/meta-monitor-manager-kms.c      \
+       backends/native/meta-monitor-manager-kms.h      \
+       backends/native/meta-weston-launch.c            \
+       backends/native/meta-weston-launch.h            \
+       backends/x11/meta-idle-monitor-xsync.c          \
+       backends/x11/meta-idle-monitor-xsync.h          \
+       backends/x11/meta-monitor-manager-xrandr.c      \
+       backends/x11/meta-monitor-manager-xrandr.h      \
+       backends/x11/meta-xrandr-shared.h               \
        core/above-tab-keycode.c                \
        core/barrier.c                          \
        meta/barrier.h                          \
@@ -288,7 +288,9 @@ mutter_wayland_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
 
 bin_PROGRAMS+=mutter-launch
 
-mutter_launch_SOURCES = backends/weston-launch.c backends/weston-launch.h
+mutter_launch_SOURCES =                        \
+       backends/native/weston-launch.c         \
+       backends/native/weston-launch.h
 
 mutter_launch_CFLAGS = $(MUTTER_LAUNCH_CFLAGS) -DLIBDIR=\"$(libdir)\"
 mutter_launch_LDFLAGS = $(MUTTER_LAUNCH_LIBS) -lpam
diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c
index f464425..464b442 100644
--- a/src/backends/meta-backend.c
+++ b/src/backends/meta-backend.c
@@ -31,7 +31,7 @@
 #include <clutter/clutter.h>
 #include <clutter/x11/clutter-x11.h>
 
-#include "meta-weston-launch.h"
+#include "backends/native/meta-weston-launch.h"
 
 /* Mutter is responsible for pulling events off the X queue, so Clutter
  * doesn't need (and shouldn't) run its normal event source which polls
diff --git a/src/backends/meta-idle-monitor.c b/src/backends/meta-idle-monitor.c
index 85affc5..7d9d293 100644
--- a/src/backends/meta-idle-monitor.c
+++ b/src/backends/meta-idle-monitor.c
@@ -38,8 +38,8 @@
 #include <meta/meta-idle-monitor.h>
 #include "meta-idle-monitor-private.h"
 #include "meta-idle-monitor-dbus.h"
-#include "meta-idle-monitor-xsync.h"
-#include "meta-idle-monitor-native.h"
+#include "backends/x11/meta-idle-monitor-xsync.h"
+#include "backends/native/meta-idle-monitor-native.h"
 
 G_STATIC_ASSERT(sizeof(unsigned long) == sizeof(gpointer));
 
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index 74b68ac..c8a640e 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -36,8 +36,8 @@
 #include "util-private.h"
 #include <meta/errors.h>
 #include "meta-monitor-config.h"
-#include "meta-monitor-manager-kms.h"
-#include "meta-monitor-manager-xrandr.h"
+#include "backends/native/meta-monitor-manager-kms.h"
+#include "backends/x11/meta-monitor-manager-xrandr.h"
 #include "meta-monitor-manager-dummy.h"
 
 enum {
diff --git a/src/backends/meta-idle-monitor-native.c b/src/backends/native/meta-idle-monitor-native.c
similarity index 100%
rename from src/backends/meta-idle-monitor-native.c
rename to src/backends/native/meta-idle-monitor-native.c
diff --git a/src/backends/meta-idle-monitor-native.h b/src/backends/native/meta-idle-monitor-native.h
similarity index 100%
rename from src/backends/meta-idle-monitor-native.h
rename to src/backends/native/meta-idle-monitor-native.h
diff --git a/src/backends/meta-monitor-manager-kms.c b/src/backends/native/meta-monitor-manager-kms.c
similarity index 100%
rename from src/backends/meta-monitor-manager-kms.c
rename to src/backends/native/meta-monitor-manager-kms.c
diff --git a/src/backends/meta-monitor-manager-kms.h b/src/backends/native/meta-monitor-manager-kms.h
similarity index 100%
rename from src/backends/meta-monitor-manager-kms.h
rename to src/backends/native/meta-monitor-manager-kms.h
diff --git a/src/backends/meta-weston-launch.c b/src/backends/native/meta-weston-launch.c
similarity index 100%
rename from src/backends/meta-weston-launch.c
rename to src/backends/native/meta-weston-launch.c
diff --git a/src/backends/meta-weston-launch.h b/src/backends/native/meta-weston-launch.h
similarity index 100%
rename from src/backends/meta-weston-launch.h
rename to src/backends/native/meta-weston-launch.h
diff --git a/src/backends/weston-launch.c b/src/backends/native/weston-launch.c
similarity index 100%
rename from src/backends/weston-launch.c
rename to src/backends/native/weston-launch.c
diff --git a/src/backends/weston-launch.h b/src/backends/native/weston-launch.h
similarity index 100%
rename from src/backends/weston-launch.h
rename to src/backends/native/weston-launch.h
diff --git a/src/backends/meta-idle-monitor-xsync.c b/src/backends/x11/meta-idle-monitor-xsync.c
similarity index 100%
rename from src/backends/meta-idle-monitor-xsync.c
rename to src/backends/x11/meta-idle-monitor-xsync.c
diff --git a/src/backends/meta-idle-monitor-xsync.h b/src/backends/x11/meta-idle-monitor-xsync.h
similarity index 100%
rename from src/backends/meta-idle-monitor-xsync.h
rename to src/backends/x11/meta-idle-monitor-xsync.h
diff --git a/src/backends/meta-monitor-manager-xrandr.c b/src/backends/x11/meta-monitor-manager-xrandr.c
similarity index 100%
rename from src/backends/meta-monitor-manager-xrandr.c
rename to src/backends/x11/meta-monitor-manager-xrandr.c
diff --git a/src/backends/meta-monitor-manager-xrandr.h b/src/backends/x11/meta-monitor-manager-xrandr.h
similarity index 100%
rename from src/backends/meta-monitor-manager-xrandr.h
rename to src/backends/x11/meta-monitor-manager-xrandr.h
diff --git a/src/core/events.c b/src/core/events.c
index 49a37d3..afc4999 100644
--- a/src/core/events.c
+++ b/src/core/events.c
@@ -34,8 +34,8 @@
 #include "window-private.h"
 #include "bell.h"
 #include "workspace-private.h"
-#include "meta-idle-monitor-xsync.h"
-#include "meta-idle-monitor-native.h"
+#include "backends/x11/meta-idle-monitor-xsync.h"
+#include "backends/native/meta-idle-monitor-native.h"
 
 #include "x11/window-x11.h"
 #include "x11/xprops.h"