diff options
| -rw-r--r-- | src/Makefile.am | 35 | ||||
| -rw-r--r-- | src/x11/async-getprop.c (renamed from src/core/async-getprop.c) | 0 | ||||
| -rw-r--r-- | src/x11/async-getprop.h (renamed from src/core/async-getprop.h) | 0 | ||||
| -rw-r--r-- | src/x11/group-private.h (renamed from src/core/group-private.h) | 0 | ||||
| -rw-r--r-- | src/x11/group-props.c (renamed from src/core/group-props.c) | 0 | ||||
| -rw-r--r-- | src/x11/group-props.h (renamed from src/core/group-props.h) | 0 | ||||
| -rw-r--r-- | src/x11/group.c (renamed from src/core/group.c) | 0 | ||||
| -rw-r--r-- | src/x11/iconcache.c (renamed from src/core/iconcache.c) | 0 | ||||
| -rw-r--r-- | src/x11/iconcache.h (renamed from src/core/iconcache.h) | 0 | ||||
| -rw-r--r-- | src/x11/window-props.c (renamed from src/core/window-props.c) | 0 | ||||
| -rw-r--r-- | src/x11/window-props.h (renamed from src/core/window-props.h) | 0 | ||||
| -rw-r--r-- | src/x11/window-x11-private.h (renamed from src/core/window-x11-private.h) | 0 | ||||
| -rw-r--r-- | src/x11/window-x11.c (renamed from src/core/window-x11.c) | 0 | ||||
| -rw-r--r-- | src/x11/window-x11.h (renamed from src/core/window-x11.h) | 0 | ||||
| -rw-r--r-- | src/x11/xprops.c (renamed from src/core/xprops.c) | 0 | ||||
| -rw-r--r-- | src/x11/xprops.h (renamed from src/core/xprops.h) | 0 |
16 files changed, 18 insertions, 17 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 25044e382..a94f49e61 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,6 +16,7 @@ INCLUDES= \ -I$(srcdir)/core \ -I$(srcdir)/ui \ -I$(srcdir)/compositor \ + -I$(srcdir)/x11 \ -DMUTTER_LIBEXECDIR=\"$(libexecdir)\" \ -DHOST_ALIAS=\"@HOST_ALIAS@\" \ -DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" \ @@ -49,8 +50,7 @@ mutter_built_sources = \ wayland/xserver-server-protocol.h libmutter_wayland_la_SOURCES = \ - core/async-getprop.c \ - core/async-getprop.h \ + core/above-tab-keycode.c \ core/barrier.c \ meta/barrier.h \ core/bell.c \ @@ -105,7 +105,6 @@ libmutter_wayland_la_SOURCES = \ meta/meta-shadow-factory.h \ meta/meta-window-actor.h \ meta/compositor-mutter.h \ - core/above-tab-keycode.c \ core/constraints.c \ core/constraints.h \ core/core.c \ @@ -123,13 +122,6 @@ libmutter_wayland_la_SOURCES = \ core/frame.h \ ui/gradient.c \ meta/gradient.h \ - core/group-private.h \ - core/group-props.c \ - core/group-props.h \ - core/group.c \ - meta/group.h \ - core/iconcache.c \ - core/iconcache.h \ core/keybindings.c \ core/keybindings-private.h \ core/main.c \ @@ -161,18 +153,11 @@ libmutter_wayland_la_SOURCES = \ core/util.c \ meta/util.h \ core/util-private.h \ - core/window-props.c \ - core/window-props.h \ - core/window-x11.c \ - core/window-x11.h \ - core/window-x11-private.h \ core/window.c \ core/window-private.h \ meta/window.h \ core/workspace.c \ core/workspace-private.h \ - core/xprops.c \ - core/xprops.h \ meta/common.h \ core/core.h \ ui/ui.h \ @@ -189,6 +174,22 @@ libmutter_wayland_la_SOURCES = \ meta/theme.h \ ui/theme-private.h \ ui/ui.c \ + x11/iconcache.c \ + x11/iconcache.h \ + x11/async-getprop.c \ + x11/async-getprop.h \ + x11/group-private.h \ + x11/group-props.c \ + x11/group-props.h \ + x11/group.c \ + meta/group.h \ + x11/window-props.c \ + x11/window-props.h \ + x11/window-x11.c \ + x11/window-x11.h \ + x11/window-x11-private.h \ + x11/xprops.c \ + x11/xprops.h \ wayland/meta-wayland.c \ wayland/meta-wayland.h \ wayland/meta-wayland-private.h \ diff --git a/src/core/async-getprop.c b/src/x11/async-getprop.c index 31b0edc3e..31b0edc3e 100644 --- a/src/core/async-getprop.c +++ b/src/x11/async-getprop.c diff --git a/src/core/async-getprop.h b/src/x11/async-getprop.h index c857e9301..c857e9301 100644 --- a/src/core/async-getprop.h +++ b/src/x11/async-getprop.h diff --git a/src/core/group-private.h b/src/x11/group-private.h index 72e6cd275..72e6cd275 100644 --- a/src/core/group-private.h +++ b/src/x11/group-private.h diff --git a/src/core/group-props.c b/src/x11/group-props.c index 521ffbd60..521ffbd60 100644 --- a/src/core/group-props.c +++ b/src/x11/group-props.c diff --git a/src/core/group-props.h b/src/x11/group-props.h index 1fb49ea1a..1fb49ea1a 100644 --- a/src/core/group-props.h +++ b/src/x11/group-props.h diff --git a/src/core/group.c b/src/x11/group.c index 8965735c2..8965735c2 100644 --- a/src/core/group.c +++ b/src/x11/group.c diff --git a/src/core/iconcache.c b/src/x11/iconcache.c index 30018d22e..30018d22e 100644 --- a/src/core/iconcache.c +++ b/src/x11/iconcache.c diff --git a/src/core/iconcache.h b/src/x11/iconcache.h index 84143a61c..84143a61c 100644 --- a/src/core/iconcache.h +++ b/src/x11/iconcache.h diff --git a/src/core/window-props.c b/src/x11/window-props.c index 35f056920..35f056920 100644 --- a/src/core/window-props.c +++ b/src/x11/window-props.c diff --git a/src/core/window-props.h b/src/x11/window-props.h index 4ea42719f..4ea42719f 100644 --- a/src/core/window-props.h +++ b/src/x11/window-props.h diff --git a/src/core/window-x11-private.h b/src/x11/window-x11-private.h index 25114daad..25114daad 100644 --- a/src/core/window-x11-private.h +++ b/src/x11/window-x11-private.h diff --git a/src/core/window-x11.c b/src/x11/window-x11.c index cade6561c..cade6561c 100644 --- a/src/core/window-x11.c +++ b/src/x11/window-x11.c diff --git a/src/core/window-x11.h b/src/x11/window-x11.h index 29d95b0f5..29d95b0f5 100644 --- a/src/core/window-x11.h +++ b/src/x11/window-x11.h diff --git a/src/core/xprops.c b/src/x11/xprops.c index 33278ab07..33278ab07 100644 --- a/src/core/xprops.c +++ b/src/x11/xprops.c diff --git a/src/core/xprops.h b/src/x11/xprops.h index 241557ff7..241557ff7 100644 --- a/src/core/xprops.h +++ b/src/x11/xprops.h |