Start creating different subdirectories for each backend

17 files changed, 21 insertions, 19 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 78c0230e8..2dff8b2fa 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 f464425b3..464b44218 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 85affc580..7d9d29355 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 74b68acf6..c8a640ee3 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
index 75b4e5a28..75b4e5a28 100644
--- a/src/backends/meta-idle-monitor-native.c
+++ b/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
index 37745c489..37745c489 100644
--- a/src/backends/meta-idle-monitor-native.h
+++ b/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
index 698c60608..698c60608 100644
--- a/src/backends/meta-monitor-manager-kms.c
+++ b/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
index 4794e313d..4794e313d 100644
--- a/src/backends/meta-monitor-manager-kms.h
+++ b/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
index a77b2eaf7..a77b2eaf7 100644
--- a/src/backends/meta-weston-launch.c
+++ b/src/backends/native/meta-weston-launch.c
diff --git a/src/backends/meta-weston-launch.h b/src/backends/native/meta-weston-launch.h
index b70faf88e..b70faf88e 100644
--- a/src/backends/meta-weston-launch.h
+++ b/src/backends/native/meta-weston-launch.h
diff --git a/src/backends/weston-launch.c b/src/backends/native/weston-launch.c
index ba1ed7476..ba1ed7476 100644
--- a/src/backends/weston-launch.c
+++ b/src/backends/native/weston-launch.c
diff --git a/src/backends/weston-launch.h b/src/backends/native/weston-launch.h
index 1e716c5ac..1e716c5ac 100644
--- a/src/backends/weston-launch.h
+++ b/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
index 25338a775..25338a775 100644
--- a/src/backends/meta-idle-monitor-xsync.c
+++ b/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
index f8e88f09e..f8e88f09e 100644
--- a/src/backends/meta-idle-monitor-xsync.h
+++ b/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
index 86ce344ee..86ce344ee 100644
--- a/src/backends/meta-monitor-manager-xrandr.c
+++ b/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
index 245a42e43..245a42e43 100644
--- a/src/backends/meta-monitor-manager-xrandr.h
+++ b/src/backends/x11/meta-monitor-manager-xrandr.h
diff --git a/src/core/events.c b/src/core/events.c
index 49a37d320..afc499997 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"