Enable vala .vapi generation, create the meta/meta.h umbrella file

.gitignore

@@ -4,6 +4,8 @@ Makefile.in.in
 aclocal.m4
 autom4te.cache
 build-aux
+clutter/clutter/mutter-clutter-0.vapi
+clutter/clutter/mutter-clutter-x11-0.vapi
 compile
 config.guess
 config.h
@@ -12,6 +14,8 @@ config.log
 config.status
 config.sub
 configure
+cogl/cogl-pango/mutter-cogl-pango-0.vapi
+cogl/cogl/mutter-cogl-0.vapi
 depcomp
 install-sh
 intltool-extract.in
@@ -85,6 +89,7 @@ src/pointer-constraints-unstable-v*-protocol.c
 src/pointer-constraints-unstable-v*-server-protocol.h
 src/xdg-foreign-unstable-v*-protocol.c
 src/xdg-foreign-unstable-v*-server-protocol.h
+src/libmutter-0.vapi
 src/meta/meta-version.h
 src/libmutter-*.pc
 doc/reference/*.args

clutter/clutter/Makefile.am

@@ -716,4 +716,29 @@ EXTRA_DIST += \
 	Makefile.am.marshal	\
 	Makefile.am.enums
 
+
+if ENABLE_VAPIGEN
+-include $(VAPIGEN_MAKEFILE)
+
+mutter-clutter-@LIBMUTTER_API_VERSION@.vapi: Clutter-@LIBMUTTER_API_VERSION@.gir mutter-clutter-@LIBMUTTER_API_VERSION@.deps
+mutter-clutter-x11-@LIBMUTTER_API_VERSION@.vapi: ClutterX11-@LIBMUTTER_API_VERSION@.gir mutter-clutter-x11-@LIBMUTTER_API_VERSION@.deps
+
+VAPIGEN_VAPIS = mutter-clutter-@LIBMUTTER_API_VERSION@.vapi mutter-clutter-x11-@LIBMUTTER_API_VERSION@.vapi
+
+mutter_clutter_@LIBMUTTER_API_VERSION@_vapi_DEPS = atk cairo pango json-glib-1.0
+mutter_clutter_@LIBMUTTER_API_VERSION@_vapi_METADATADIRS = $(srcdir)
+mutter_clutter_@LIBMUTTER_API_VERSION@_vapi_GIRDIRS = $(top_builddir)/../cogl/cogl $(top_builddir)/../cogl/cogl-pango
+mutter_clutter_@LIBMUTTER_API_VERSION@_vapi_FILES = Clutter-@LIBMUTTER_API_VERSION@.gir
+
+mutter_clutter_x11_@LIBMUTTER_API_VERSION@_vapi_DEPS = atk cairo pango json-glib-1.0
+mutter_clutter_x11_@LIBMUTTER_API_VERSION@_vapi_METADATADIRS = $(srcdir)
+mutter_clutter_x11_@LIBMUTTER_API_VERSION@_vapi_GIRDIRS = $(srcdir) $(top_builddir)/../cogl/cogl $(top_builddir)/../cogl/cogl-pango
+mutter_clutter_x11_@LIBMUTTER_API_VERSION@_vapi_FILES = ClutterX11-@LIBMUTTER_API_VERSION@.gir
+
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
+
+EXTRA_DIST += mutter-clutter-@LIBMUTTER_API_VERSION@.deps mutter-clutter-x11-@LIBMUTTER_API_VERSION@.deps
+endif
+
 CLEANFILES += $(gir_DATA) $(typelib_DATA)

clutter/clutter/mutter-clutter-0.deps

@@ -0,0 +1,5 @@
+cairo
+gio-2.0
+atk
+pangocairo
+json-glib-1.0

clutter/clutter/mutter-clutter-x11-0.deps

@@ -0,0 +1,5 @@
+cairo
+gio-2.0
+atk
+pangocairo
+json-glib-1.0

clutter/configure.ac

@@ -763,6 +763,10 @@ dnl === GObject-Introspection check ===========================================
 
 GOBJECT_INTROSPECTION_CHECK([gi_req_version])
 
+dnl === Vala vapigen check ===========================================
+
+VAPIGEN_CHECK()
+
 dnl === Conformance test suite ================================================
 
 GLIB_TESTS

clutter/tests/interactive/.gitignore

@@ -1,56 +0,0 @@
-/stamp-test-interactive
-/stamp-test-unit-names
-/test-actors
-/test-animation
-/test-animator
-/test-bind-constraint
-/test-binding-pool
-/test-cairo-clock
-/test-cairo-flowers
-/test-clip
-/test-cogl-multitexture
-/test-cogl-offscreen
-/test-cogl-point-sprites
-/test-cogl-primitives
-/test-cogl-shader-arbfp
-/test-cogl-shader-glsl
-/test-cogl-tex-convert
-/test-cogl-tex-foreign
-/test-cogl-tex-getset
-/test-cogl-tex-polygon
-/test-cogl-tex-tile
-/test-cogl-vertex-buffer
-/test-content
-/test-devices
-/test-easing
-/test-events
-/test-fbo
-/test-grab
-/test-image
-/test-interactive
-/test-keyframe-transition
-/test-layout
-/test-multistage
-/test-paint-wrapper
-/test-path-constraint
-/test-pixmap
-/test-rotate-zoom
-/test-scale
-/test-script
-/test-scrolling
-/test-shader-effects
-/test-stage-read-pixels
-/test-stage-sizing
-/test-state
-/test-state-animator
-/test-state-script
-/test-swipe-action
-/test-table-layout
-/test-text
-/test-text-field
-/test-texture-async
-/test-texture-material
-/test-texture-quality
-/test-texture-slicing
-/test-touch-events
-/test-unit-names.h

cogl/cogl-pango/Makefile.am

@@ -91,3 +91,21 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
 endif
+
+if ENABLE_VAPIGEN
+-include $(VAPIGEN_MAKEFILE)
+
+mutter-cogl-@LIBMUTTER_API_VERSION@.vapi: CoglPango-@LIBMUTTER_API_VERSION@.gir mutter-cogl-pango-@LIBMUTTER_API_VERSION@.deps
+
+VAPIGEN_VAPIS = mutter-cogl-pango-@LIBMUTTER_API_VERSION@.vapi
+
+mutter_cogl_pango_@LIBMUTTER_API_VERSION@_vapi_DEPS = pango
+mutter_cogl_pango_@LIBMUTTER_API_VERSION@_vapi_METADATADIRS = $(srcdir)
+mutter_cogl_pango_@LIBMUTTER_API_VERSION@_vapi_FILES = CoglPango-@LIBMUTTER_API_VERSION@.gir
+mutter_cogl_pango_@LIBMUTTER_API_VERSION@_vapi_GIRDIRS = $(top_builddir)/cogl
+
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
+
+EXTRA_DIST += mutter-cogl-pango-@LIBMUTTER_API_VERSION@.deps
+endif

cogl/cogl-pango/mutter-cogl-pango-0.deps

@@ -0,0 +1 @@
+pango

cogl/cogl/Makefile.am

@@ -506,5 +506,22 @@ gir_DATA = $(INTROSPECTION_GIRS)
 typelibdir = $(mutterlibdir)
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
+if ENABLE_VAPIGEN
+-include $(VAPIGEN_MAKEFILE)
+
+mutter-cogl-@LIBMUTTER_API_VERSION@.vapi: Cogl-@LIBMUTTER_API_VERSION@.gir mutter-cogl-@LIBMUTTER_API_VERSION@.deps
+
+VAPIGEN_VAPIS = mutter-cogl-@LIBMUTTER_API_VERSION@.vapi
+
+mutter_cogl_@LIBMUTTER_API_VERSION@_vapi_DEPS = pango
+mutter_cogl_@LIBMUTTER_API_VERSION@_vapi_METADATADIRS = $(srcdir)
+mutter_cogl_@LIBMUTTER_API_VERSION@_vapi_FILES = Cogl-@LIBMUTTER_API_VERSION@.gir
+
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
+
+EXTRA_DIST += mutter-cogl-@LIBMUTTER_API_VERSION@.deps
+endif
+
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
 endif

cogl/cogl/mutter-cogl-0.deps

@@ -0,0 +1 @@
+pango

cogl/configure.ac

@@ -842,6 +842,11 @@ dnl GObject-Introspection check
 dnl ================================================================
 GOBJECT_INTROSPECTION_CHECK([gi_req_version])
 
+dnl ================================================================
+dnl Vala vapigen check
+dnl ================================================================
+VAPIGEN_CHECK()
+
 dnl ================================================================
 dnl Checks for header files.
 dnl ================================================================

configure.ac

@@ -246,6 +246,8 @@ if test x$found_introspection != xno; then
   MUTTER_PC_MODULES="$MUTTER_PC_MODULES gobject-introspection-1.0"
 fi
 
+VAPIGEN_CHECK()
+
 AC_SUBST(XWAYLAND_PATH)
 
 PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)
@@ -509,6 +511,7 @@ mutter-$VERSION
 	libwacom:                 ${have_libwacom}
 	gudev                     ${have_gudev}
 	Introspection:            ${found_introspection}
+	Vala:                     ${enable_vala}
 	Session management:       ${found_sm}
 	Wayland:                  ${have_wayland}
 	Native (KMS) backend:     ${have_native_backend}

src/Makefile.am

@@ -43,6 +43,7 @@ AM_CPPFLAGS = \
 	-DMUTTER_PLUGIN_DIR=\"$(MUTTER_PLUGIN_DIR)\"			\
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"			\
 	-DXWAYLAND_PATH=\"$(XWAYLAND_PATH)\"				\
+	-DMUTTER_COMPILATION=1			\
 	$(NULL)
 
 mutter_built_sources = \
@@ -536,10 +537,31 @@ Meta_@LIBMUTTER_API_VERSION@_gir_LIBS = libmutter-$(LIBMUTTER_API_VERSION).la
 Meta_@LIBMUTTER_API_VERSION@_gir_FILES =			\
 	$(libmutterinclude_base_headers)			\
 	$(filter %.c,$(libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES) $(nodist_libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES))
-Meta_@LIBMUTTER_API_VERSION@_SCANNERFLAGS = --warn-all --warn-error
+Meta_@LIBMUTTER_API_VERSION@_gir_SCANNERFLAGS = \
+	--warn-all \
+	--warn-error \
+	--c-include='meta/meta.h'
 
 endif
 
+if ENABLE_VAPIGEN
+-include $(VAPIGEN_MAKEFILE)
+
+libmutter-@LIBMUTTER_API_VERSION@.vapi: Meta-@LIBMUTTER_API_VERSION@.gir libmutter-@LIBMUTTER_API_VERSION@.deps
+
+VAPIGEN_VAPIS = libmutter-@LIBMUTTER_API_VERSION@.vapi
+
+libmutter_@LIBMUTTER_API_VERSION@_vapi_DEPS = cairo gdk-3.0 gdk-pixbuf-2.0 gtk+-3.0 x11 json-glib-1.0
+libmutter_@LIBMUTTER_API_VERSION@_vapi_METADATADIRS = $(srcdir)
+libmutter_@LIBMUTTER_API_VERSION@_vapi_FILES = Meta-@LIBMUTTER_API_VERSION@.gir
+libmutter_@LIBMUTTER_API_VERSION@_vapi_GIRDIRS = $(top_builddir)/cogl/cogl $(top_builddir)/cogl/cogl-pango $(top_builddir)/clutter/clutter
+
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
+
+EXTRA_DIST += libmutter-@LIBMUTTER_API_VERSION@.deps
+endif
+
 dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h
 
 CLEANFILES =					\

src/compositor/plugins/default.c

@@ -21,11 +21,7 @@
 
 #include <config.h>
 
-#include <meta/meta-plugin.h>
+#include <meta/meta.h>
-#include <meta/window.h>
-#include <meta/meta-background-group.h>
-#include <meta/meta-background-actor.h>
-#include <meta/util.h>
 #include <glib/gi18n-lib.h>
 
 #include <clutter/clutter.h>

src/libmutter-0.deps

@@ -0,0 +1,6 @@
+cairo
+gdk-3.0
+gdk-pixbuf-2.0
+gtk+-3.0
+x11
+json-glib-1.0

src/meta/barrier.h

@@ -3,6 +3,10 @@
 #ifndef __META_BARRIER_H__
 #define __META_BARRIER_H__
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 
 #include <meta/display.h>

src/meta/boxes.h

@@ -22,6 +22,10 @@
 #ifndef META_BOXES_H
 #define META_BOXES_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 #include <meta/common.h>
 

src/meta/common.h

@@ -25,6 +25,10 @@
 #ifndef META_COMMON_H
 #define META_COMMON_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 /* Don't include core headers here */
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput.h>

src/meta/compositor-mutter.h

@@ -23,6 +23,10 @@
 #ifndef MUTTER_H_
 #define MUTTER_H_
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <clutter/clutter.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/Xfixes.h>

src/meta/compositor.h

@@ -20,6 +20,10 @@
 #ifndef META_COMPOSITOR_H
 #define META_COMPOSITOR_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <glib.h>
 #include <X11/Xlib.h>
 

src/meta/display.h

@@ -20,6 +20,10 @@
 #ifndef META_DISPLAY_H
 #define META_DISPLAY_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 #include <X11/Xlib.h>
 

src/meta/errors.h

@@ -22,6 +22,10 @@
 #ifndef META_ERRORS_H
 #define META_ERRORS_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <X11/Xlib.h>
 
 #include <meta/util.h>

src/meta/group.h

@@ -22,6 +22,10 @@
 #ifndef META_GROUP_H
 #define META_GROUP_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <X11/Xlib.h>
 #include <glib.h>
 #include <meta/types.h>

src/meta/keybindings.h

@@ -18,6 +18,10 @@
 #ifndef META_KEYBINDINGS_H
 #define META_KEYBINDINGS_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <meta/display.h>
 #include <meta/common.h>
 

src/meta/main.h

@@ -22,6 +22,10 @@
 #ifndef META_MAIN_H
 #define META_MAIN_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <glib.h>
 
 GOptionContext *meta_get_option_context     (void);

src/meta/meta-backend.h

@@ -25,6 +25,10 @@
 #ifndef META_BACKEND_H
 #define META_BACKEND_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 
 #include <clutter/clutter.h>

src/meta/meta-background-actor.h

@@ -21,6 +21,10 @@
 #ifndef META_BACKGROUND_ACTOR_H
 #define META_BACKGROUND_ACTOR_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <clutter/clutter.h>
 #include <meta/screen.h>
 #include <meta/meta-background.h>

src/meta/meta-background-group.h

@@ -3,6 +3,10 @@
 #ifndef META_BACKGROUND_GROUP_H
 #define META_BACKGROUND_GROUP_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <clutter/clutter.h>
 
 #define META_TYPE_BACKGROUND_GROUP            (meta_background_group_get_type ())

src/meta/meta-background-image.h

@@ -23,6 +23,10 @@
 #ifndef __META_BACKGROUND_IMAGE_H__
 #define __META_BACKGROUND_IMAGE_H__
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 #include <cogl/cogl.h>
 

src/meta/meta-background.h

@@ -21,6 +21,10 @@
 #ifndef META_BACKGROUND_H
 #define META_BACKGROUND_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <clutter/clutter.h>
 #include <gsettings-desktop-schemas/gdesktop-enums.h>
 #include <meta/screen.h>

src/meta/meta-close-dialog.h

@@ -22,6 +22,10 @@
 #ifndef META_CLOSE_DIALOG_H
 #define META_CLOSE_DIALOG_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 #include <meta/window.h>
 

src/meta/meta-cursor-tracker.h

@@ -22,6 +22,10 @@
 #ifndef META_CURSOR_TRACKER_H
 #define META_CURSOR_TRACKER_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 #include <meta/types.h>
 #include <meta/workspace.h>

src/meta/meta-dnd.h

@@ -20,6 +20,10 @@
 #ifndef META_DND_H
 #define META_DND_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 #include <string.h>
 

src/meta/meta-idle-monitor.h

@@ -20,6 +20,10 @@
 #ifndef META_IDLE_MONITOR_H
 #define META_IDLE_MONITOR_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 #include <meta/types.h>
 

src/meta/meta-monitor-manager.h

@@ -22,6 +22,10 @@
 #ifndef META_MONITOR_MANAGER_H
 #define META_MONITOR_MANAGER_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 
 typedef struct _MetaMonitorManagerClass    MetaMonitorManagerClass;

src/meta/meta-plugin.h

@@ -22,6 +22,10 @@
 #ifndef META_PLUGIN_H_
 #define META_PLUGIN_H_
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <meta/types.h>
 #include <meta/compositor.h>
 #include <meta/compositor-mutter.h>

src/meta/meta-settings.h

@@ -22,6 +22,10 @@
 #ifndef META_SETTINGS_H
 #define META_SETTINGS_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include "meta/types.h"
 
 int meta_settings_get_ui_scaling_factor (MetaSettings *settings);

src/meta/meta-shadow-factory.h

@@ -23,6 +23,10 @@
 #ifndef __META_SHADOW_FACTORY_H__
 #define __META_SHADOW_FACTORY_H__
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <cairo.h>
 #include <clutter/clutter.h>
 #include <meta/meta-window-shape.h>

src/meta/meta-shaped-texture.h

@@ -24,6 +24,10 @@
 #ifndef __META_SHAPED_TEXTURE_H__
 #define __META_SHAPED_TEXTURE_H__
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <clutter/clutter.h>
 #include <X11/Xlib.h>
 

src/meta/meta-version.h.in

@@ -20,6 +20,10 @@
 #ifndef META_VERSION_H
 #define META_VERSION_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #define META_MAJOR_VERSION @MUTTER_MAJOR_VERSION@
 #define META_MINOR_VERSION @MUTTER_MINOR_VERSION@
 #define META_MICRO_VERSION @MUTTER_MICRO_VERSION@

src/meta/meta-window-actor.h

@@ -23,6 +23,10 @@
 #ifndef META_WINDOW_ACTOR_H_
 #define META_WINDOW_ACTOR_H_
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <clutter/clutter.h>
 #include <X11/Xlib.h>
 

src/meta/meta-window-shape.h

@@ -23,6 +23,10 @@
 #ifndef __META_WINDOW_SHAPE_H__
 #define __META_WINDOW_SHAPE_H__
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <cairo.h>
 #include <glib-object.h>
 

src/meta/meta.h

@@ -0,0 +1,65 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Mutter main */
+
+/*
+ * Copyright (C) 2001 Havoc Pennington
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __META_H__
+#define __META_H__
+
+#define __META_H_INSIDE__
+
+#include "barrier.h"
+#include "boxes.h"
+#include "common.h"
+#include "compositor.h"
+#include "compositor-mutter.h"
+#include "display.h"
+#include "errors.h"
+#include "group.h"
+#include "keybindings.h"
+#include "main.h"
+#include "meta-backend.h"
+#include "meta-background-actor.h"
+#include "meta-background-group.h"
+#include "meta-background.h"
+#include "meta-background-image.h"
+#include "meta-close-dialog.h"
+#include "meta-cursor-tracker.h"
+#include "meta-dnd.h"
+#include "meta-enum-types.h"
+#include "meta-idle-monitor.h"
+#include "meta-monitor-manager.h"
+#include "meta-plugin.h"
+#include "meta-settings.h"
+#include "meta-shadow-factory.h"
+#include "meta-shaped-texture.h"
+#include "meta-version.h"
+#include "meta-window-actor.h"
+#include "meta-window-shape.h"
+#include "prefs.h"
+#include "screen.h"
+#include "theme.h"
+#include "types.h"
+#include "util.h"
+#include "window.h"
+#include "workspace.h"
+
+#undef __META_H_INSIDE__
+
+#endif /* __META_H__ */

src/meta/prefs.h

@@ -23,6 +23,10 @@
 #ifndef META_PREFS_H
 #define META_PREFS_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 /* This header is a "common" one between the UI and core side */
 #include <meta/common.h>
 #include <meta/types.h>

src/meta/screen.h

@@ -20,6 +20,10 @@
 #ifndef META_SCREEN_H
 #define META_SCREEN_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <X11/Xlib.h>
 #include <glib-object.h>
 #include <meta/types.h>

src/meta/theme.h

@@ -22,6 +22,10 @@
 #ifndef META_THEME_H
 #define META_THEME_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <glib.h>
 
 /**

src/meta/types.h

@@ -20,6 +20,10 @@
 #ifndef META_TYPES_H
 #define META_TYPES_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 /**
  * MetaCompositor: (skip)
  *

src/meta/util.h

@@ -23,6 +23,10 @@
 #ifndef META_UTIL_H
 #define META_UTIL_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <glib.h>
 #include <glib-object.h>
 

src/meta/window.h

@@ -20,6 +20,10 @@
 #ifndef META_WINDOW_H
 #define META_WINDOW_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 #include <cairo.h>
 #include <X11/Xlib.h>

src/meta/workspace.h

@@ -21,6 +21,10 @@
 #ifndef META_WORKSPACE_H
 #define META_WORKSPACE_H
 
+#if !defined(__META_H_INSIDE__) && !defined(MUTTER_COMPILATION)
+#error "Only <meta/meta.h> can be included directly."
+#endif
+
 #include <meta/types.h>
 #include <meta/boxes.h>
 #include <meta/screen.h>