[mutter] Move atomnames.h to x11/

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

commit ca6e799b97a9ec24d3c4b608f4c0ac57eedd3026
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Apr 27 16:36:46 2015 -0700

    Move atomnames.h to x11/
    
    This should *not* be part of the public API.

 src/Makefile.am               |   13 ++++---------
 src/core/display-private.h    |    2 +-
 src/core/display.c            |    4 ++--
 src/core/screen.c             |    2 +-
 src/{meta => x11}/atomnames.h |    0
 5 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index baadb41..bd17b07 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -210,10 +210,9 @@ libmutter_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/atomnames.h                         \
        x11/events.c                            \
        x11/events.h                            \
        x11/group-private.h                     \
@@ -221,6 +220,8 @@ libmutter_la_SOURCES =                              \
        x11/group-props.h                       \
        x11/group.c                             \
        meta/group.h                            \
+       x11/iconcache.c                         \
+       x11/iconcache.h                         \
        x11/session.c                           \
        x11/session.h                           \
        x11/window-props.c                      \
@@ -338,16 +339,10 @@ libmutterinclude_base_headers =                   \
        $(libmutterinclude_headers)             \
        $(libmutterinclude_built_headers)
 
-# Excluded from scanning for introspection but installed
-# atomnames.h: macros cause problems for scanning process
-libmutterinclude_extra_headers =               \
-       meta/atomnames.h
-
 libmutterincludedir = $(includedir)/mutter/meta
 
 libmutterinclude_HEADERS =                     \
-       $(libmutterinclude_headers)             \
-       $(libmutterinclude_extra_headers)
+       $(libmutterinclude_headers)
 
 nodist_libmutterinclude_HEADERS =              \
        $(libmutterinclude_built_headers)
diff --git a/src/core/display-private.h b/src/core/display-private.h
index 18ae19f..420dda9 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -121,7 +121,7 @@ struct _MetaDisplay
    * class is constructed.
    */
 #define item(x)  Atom atom_##x;
-#include <meta/atomnames.h>
+#include <x11/atomnames.h>
 #undef item
 
   /* The window and serial of the most recent FocusIn event. */
diff --git a/src/core/display.c b/src/core/display.c
index 53cec6f..04bf973 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -549,7 +549,7 @@ meta_display_open (void)
   /* A list of all atom names, so that we can intern them in one go. */
   char *atom_names[] = {
 #define item(x) #x,
-#include <meta/atomnames.h>
+#include <x11/atomnames.h>
 #undef item
   };
   Atom atoms[G_N_ELEMENTS(atom_names)];
@@ -610,7 +610,7 @@ meta_display_open (void)
   {
     int i = 0;
 #define item(x) display->atom_##x = atoms[i++];
-#include <meta/atomnames.h>
+#include <x11/atomnames.h>
 #undef item
   }
 
diff --git a/src/core/screen.c b/src/core/screen.c
index 49df711..46d818f 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -294,7 +294,7 @@ set_supported_hint (MetaScreen *screen)
   Atom atoms[] = {
 #define EWMH_ATOMS_ONLY
 #define item(x)  screen->display->atom_##x,
-#include <meta/atomnames.h>
+#include <x11/atomnames.h>
 #undef item
 #undef EWMH_ATOMS_ONLY
 
diff --git a/src/meta/atomnames.h b/src/x11/atomnames.h
similarity index 100%
rename from src/meta/atomnames.h
rename to src/x11/atomnames.h