diff --git a/src/Makefile.am b/src/Makefile.am index 0af758288..4912f354e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,6 +13,7 @@ INCLUDES= \ $(MUTTER_CFLAGS) \ -I$(top_builddir) \ -I$(srcdir) \ + -I$(srcdir)/backends \ -I$(srcdir)/core \ -I$(srcdir)/ui \ -I$(srcdir)/compositor \ @@ -50,6 +51,30 @@ wayland_protocols = \ wayland/protocol/xserver.xml libmutter_wayland_la_SOURCES = \ + backends/meta-cursor.c \ + backends/meta-cursor.h \ + backends/meta-cursor-private.h \ + backends/meta-cursor-tracker.c \ + backends/meta-cursor-tracker-private.h \ + backends/meta-idle-monitor.c \ + 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 \ core/above-tab-keycode.c \ core/barrier.c \ meta/barrier.h \ @@ -127,30 +152,6 @@ libmutter_wayland_la_SOURCES = \ core/keybindings.c \ core/keybindings-private.h \ core/main.c \ - core/meta-cursor.c \ - core/meta-cursor.h \ - core/meta-cursor-private.h \ - core/meta-cursor-tracker.c \ - core/meta-cursor-tracker-private.h \ - core/meta-idle-monitor.c \ - core/meta-idle-monitor-private.h \ - core/meta-idle-monitor-dbus.c \ - core/meta-idle-monitor-dbus.h \ - core/meta-idle-monitor-xsync.c \ - core/meta-idle-monitor-xsync.h \ - core/meta-idle-monitor-native.c \ - core/meta-idle-monitor-native.h \ - core/meta-xrandr-shared.h \ - core/meta-monitor-config.c \ - core/meta-monitor-config.h \ - core/meta-monitor-manager.c \ - core/meta-monitor-manager.h \ - core/meta-monitor-manager-dummy.c \ - core/meta-monitor-manager-dummy.h \ - core/meta-monitor-manager-kms.c \ - core/meta-monitor-manager-kms.h \ - core/meta-monitor-manager-xrandr.c \ - core/meta-monitor-manager-xrandr.h \ core/mutter-Xatomtype.h \ core/place.c \ core/place.h \ diff --git a/src/core/meta-cursor-private.h b/src/backends/meta-cursor-private.h similarity index 100% rename from src/core/meta-cursor-private.h rename to src/backends/meta-cursor-private.h diff --git a/src/core/meta-cursor-tracker-private.h b/src/backends/meta-cursor-tracker-private.h similarity index 100% rename from src/core/meta-cursor-tracker-private.h rename to src/backends/meta-cursor-tracker-private.h diff --git a/src/core/meta-cursor-tracker.c b/src/backends/meta-cursor-tracker.c similarity index 100% rename from src/core/meta-cursor-tracker.c rename to src/backends/meta-cursor-tracker.c diff --git a/src/core/meta-cursor.c b/src/backends/meta-cursor.c similarity index 100% rename from src/core/meta-cursor.c rename to src/backends/meta-cursor.c diff --git a/src/core/meta-cursor.h b/src/backends/meta-cursor.h similarity index 100% rename from src/core/meta-cursor.h rename to src/backends/meta-cursor.h diff --git a/src/core/meta-idle-monitor-dbus.c b/src/backends/meta-idle-monitor-dbus.c similarity index 100% rename from src/core/meta-idle-monitor-dbus.c rename to src/backends/meta-idle-monitor-dbus.c diff --git a/src/core/meta-idle-monitor-dbus.h b/src/backends/meta-idle-monitor-dbus.h similarity index 100% rename from src/core/meta-idle-monitor-dbus.h rename to src/backends/meta-idle-monitor-dbus.h diff --git a/src/core/meta-idle-monitor-native.c b/src/backends/meta-idle-monitor-native.c similarity index 100% rename from src/core/meta-idle-monitor-native.c rename to src/backends/meta-idle-monitor-native.c diff --git a/src/core/meta-idle-monitor-native.h b/src/backends/meta-idle-monitor-native.h similarity index 100% rename from src/core/meta-idle-monitor-native.h rename to src/backends/meta-idle-monitor-native.h diff --git a/src/core/meta-idle-monitor-private.h b/src/backends/meta-idle-monitor-private.h similarity index 100% rename from src/core/meta-idle-monitor-private.h rename to src/backends/meta-idle-monitor-private.h diff --git a/src/core/meta-idle-monitor-xsync.c b/src/backends/meta-idle-monitor-xsync.c similarity index 100% rename from src/core/meta-idle-monitor-xsync.c rename to src/backends/meta-idle-monitor-xsync.c diff --git a/src/core/meta-idle-monitor-xsync.h b/src/backends/meta-idle-monitor-xsync.h similarity index 100% rename from src/core/meta-idle-monitor-xsync.h rename to src/backends/meta-idle-monitor-xsync.h diff --git a/src/core/meta-idle-monitor.c b/src/backends/meta-idle-monitor.c similarity index 100% rename from src/core/meta-idle-monitor.c rename to src/backends/meta-idle-monitor.c diff --git a/src/core/meta-monitor-config.c b/src/backends/meta-monitor-config.c similarity index 100% rename from src/core/meta-monitor-config.c rename to src/backends/meta-monitor-config.c diff --git a/src/core/meta-monitor-config.h b/src/backends/meta-monitor-config.h similarity index 100% rename from src/core/meta-monitor-config.h rename to src/backends/meta-monitor-config.h diff --git a/src/core/meta-monitor-manager-dummy.c b/src/backends/meta-monitor-manager-dummy.c similarity index 100% rename from src/core/meta-monitor-manager-dummy.c rename to src/backends/meta-monitor-manager-dummy.c diff --git a/src/core/meta-monitor-manager-dummy.h b/src/backends/meta-monitor-manager-dummy.h similarity index 100% rename from src/core/meta-monitor-manager-dummy.h rename to src/backends/meta-monitor-manager-dummy.h diff --git a/src/core/meta-monitor-manager-kms.c b/src/backends/meta-monitor-manager-kms.c similarity index 100% rename from src/core/meta-monitor-manager-kms.c rename to src/backends/meta-monitor-manager-kms.c diff --git a/src/core/meta-monitor-manager-kms.h b/src/backends/meta-monitor-manager-kms.h similarity index 100% rename from src/core/meta-monitor-manager-kms.h rename to src/backends/meta-monitor-manager-kms.h diff --git a/src/core/meta-monitor-manager-xrandr.c b/src/backends/meta-monitor-manager-xrandr.c similarity index 100% rename from src/core/meta-monitor-manager-xrandr.c rename to src/backends/meta-monitor-manager-xrandr.c diff --git a/src/core/meta-monitor-manager-xrandr.h b/src/backends/meta-monitor-manager-xrandr.h similarity index 100% rename from src/core/meta-monitor-manager-xrandr.h rename to src/backends/meta-monitor-manager-xrandr.h diff --git a/src/core/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c similarity index 100% rename from src/core/meta-monitor-manager.c rename to src/backends/meta-monitor-manager.c diff --git a/src/core/meta-monitor-manager.h b/src/backends/meta-monitor-manager.h similarity index 100% rename from src/core/meta-monitor-manager.h rename to src/backends/meta-monitor-manager.h diff --git a/src/core/meta-xrandr-shared.h b/src/backends/meta-xrandr-shared.h similarity index 100% rename from src/core/meta-xrandr-shared.h rename to src/backends/meta-xrandr-shared.h