build: Only install group.h header when built with x11

Also rename the header to file to be consistent with other x11-only
headers

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3776>

src/core/display.c

@@ -68,7 +68,7 @@
 #include "backends/x11/cm/meta-backend-x11-cm.h"
 #include "backends/x11/nested/meta-backend-x11-nested.h"
 #include "compositor/meta-compositor-x11.h"
-#include "meta/group.h"
+#include "meta/meta-x11-group.h"
 #include "x11/meta-startup-notification-x11.h"
 #include "x11/meta-x11-display-private.h"
 #include "x11/window-x11.h"

src/core/stack.c

@@ -39,7 +39,7 @@
 #include "meta/workspace.h"
 
 #ifdef HAVE_X11_CLIENT
-#include "meta/group.h"
+#include "meta/meta-x11-group.h"
 #include "x11/meta-x11-display-private.h"
 #include "x11/window-x11.h"
 #endif

src/core/window.c

@@ -83,10 +83,10 @@
 #include "meta/prefs.h"
 
 #ifdef HAVE_X11_CLIENT
-#include "meta/group.h"
 #include "mtk/mtk-x11.h"
 #include "x11/meta-x11-display-private.h"
 #include "x11/meta-x11-frame.h"
+#include "x11/meta-x11-group-private.h"
 #include "x11/window-props.h"
 #include "x11/window-x11-private.h"
 #include "x11/window-x11.h"

src/meson.build

@@ -467,8 +467,6 @@ if have_x11_client
     'x11/atomnames.h',
     'x11/events.c',
     'x11/events.h',
-    'x11/group.c',
-    'x11/group-private.h',
     'x11/group-props.c',
     'x11/group-props.h',
     'x11/meta-selection-source-x11.c',
@@ -482,6 +480,8 @@ if have_x11_client
     'x11/meta-x11-event-source.c',
     'x11/meta-x11-frame.c',
     'x11/meta-x11-frame.h',
+    'x11/meta-x11-group.c',
+    'x11/meta-x11-group-private.h',
     'x11/meta-x11-selection.c',
     'x11/meta-x11-selection-private.h',
     'x11/meta-x11-selection-input-stream.c',

src/meta/meson.build

@@ -5,7 +5,6 @@ mutter_public_headers = [
   'compositor.h',
   'compositor-mutter.h',
   'display.h',
-  'group.h',
   'keybindings.h',
   'main.h',
   'meta-backend.h',
@@ -62,6 +61,7 @@ if have_x11_client
   mutter_public_headers += [
     'meta-x11-display.h',
     'meta-x11-types.h',
+    'meta-x11-group.h',
   ]
 endif
 

src/x11/events.c

@@ -39,7 +39,6 @@
 #include "core/meta-workspace-manager-private.h"
 #include "core/window-private.h"
 #include "core/workspace-private.h"
-#include "meta/group.h"
 #include "meta/meta-backend.h"
 #include "meta/meta-context.h"
 #include "mtk/mtk-x11.h"
@@ -47,6 +46,7 @@
 #include "x11/meta-x11-display-private.h"
 #include "x11/meta-x11-event-source.h"
 #include "x11/meta-x11-frame.h"
+#include "x11/meta-x11-group-private.h"
 #include "x11/meta-x11-selection-private.h"
 #include "x11/meta-x11-selection-input-stream-private.h"
 #include "x11/meta-x11-selection-output-stream-private.h"

src/x11/group-props.c

@@ -25,8 +25,8 @@
 
 #include <X11/Xatom.h>
 
-#include "x11/group-private.h"
 #include "x11/meta-x11-display-private.h"
+#include "x11/meta-x11-group-private.h"
 #include "x11/xprops.h"
 
 typedef void (* InitValueFunc)   (MetaX11Display *x11_display,

src/x11/group-props.h

@@ -22,7 +22,7 @@
 #pragma once
 
 #include "core/window-private.h"
-#include "meta/group.h"
+#include "meta/meta-x11-group.h"
 
 void meta_group_reload_property         (MetaGroup   *group,
                                          Atom         property);

src/x11/meta-x11-group-private.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "meta/group.h"
+#include "meta/meta-x11-group.h"
 
 #include <X11/Xlib.h>
 

src/x11/meta-x11-group.c

@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include "x11/group-private.h"
+#include "x11/meta-x11-group-private.h"
 
 #include <X11/Xlib-xcb.h>
 

src/x11/window-props.c

@@ -46,7 +46,7 @@
 #include "compositor/compositor-private.h"
 #include "core/meta-workspace-manager-private.h"
 #include "core/util-private.h"
-#include "meta/group.h"
+#include "meta/meta-x11-group.h"
 #include "mtk/mtk-x11.h"
 #include "x11/meta-x11-display-private.h"
 #include "x11/meta-x11-frame.h"

src/x11/window-x11.c

@@ -51,10 +51,10 @@
 #include "wayland/meta-window-xwayland.h"
 #endif
 
-#include "x11/group-private.h"
 #include "x11/meta-sync-counter.h"
 #include "x11/meta-x11-display-private.h"
 #include "x11/meta-x11-frame.h"
+#include "x11/meta-x11-group-private.h"
 #include "x11/session.h"
 #include "x11/window-props.h"
 #include "x11/xprops.h"