Move the installed includes to a subdir

If mutter is going to be a "real" library, then it should install its
includes so that users can do

    #include <meta/display.h>

rather than

    #include <display.h>

So rename the includedir accordingly, move src/include to src/meta,
and fix up all internal references.

There were a handful of header files in src/include that were not
installed; this appears to have been part of a plan to keep core/,
ui/, and compositor/ from looking at each others' private includes,
but that wasn't really working anyway. So move all non-installed
headers back into core/ or ui/.

https://bugzilla.gnome.org/show_bug.cgi?id=643959
This commit is contained in:
Dan Winship
2011-03-05 19:29:12 -05:00
parent bb50f65532
commit c84da3ce1b
99 changed files with 257 additions and 283 deletions

View File

@@ -28,16 +28,16 @@
#include <config.h>
#include "screen-private.h"
#include "util.h"
#include "errors.h"
#include <meta/util.h>
#include <meta/errors.h>
#include "window-private.h"
#include "frame-private.h"
#include "prefs.h"
#include "frame.h"
#include <meta/prefs.h>
#include "workspace-private.h"
#include "keybindings-private.h"
#include "stack.h"
#include "xprops.h"
#include "compositor.h"
#include <meta/compositor.h>
#include "mutter-marshal.h"
#include "mutter-enum-types.h"
@@ -277,7 +277,7 @@ set_supported_hint (MetaScreen *screen)
Atom atoms[] = {
#define EWMH_ATOMS_ONLY
#define item(x) screen->display->atom_##x,
#include "atomnames.h"
#include <meta/atomnames.h>
#undef item
#undef EWMH_ATOMS_ONLY
};