build: Another pass at overhauling the naming schemes

There currently lots of inconsistent ways we refer to matchbox 2; it can
be mbwm2, matchbox-wm-2, matchbox2, matchbox-window-manager-2 and things
are also confusing when considering the naming of pkg-config files and for
choosing the directory name for installing headers.

The approach I'm starting to settle on (this goes back on some of the
renaming changes I made recently, so sorry for the churn) is to consider
the canonical name of the project just "matchbox" and then we use the
package/library versioning to define it as "2.0".

Headers now get installed in $prefix/include/matchbox-2.0/matchbox and
the top level header has been renamed from mb-wm.h to matchbox.h. The
pkg-config file will be installed as matchbox-2.0.pc

Makefile.am

@@ -1,4 +1,13 @@
-SUBDIRS = matchbox2 managers data doc util
+SUBDIRS = matchbox managers data doc util
+
+pcfiles = matchbox-$(MBWM_API_VERSION).pc
+
+pkgconfig_DATA = $(pcfiles)
+pkgconfigdir   = $(libdir)/pkgconfig
+
+EXTRA_DIST = matchbox.pc.in
+
+CLEANFILES = $(pcfiles)
 
 # Extra clean files so that maintainer-clean removes *everything*
 

autogen.sh

@@ -5,7 +5,7 @@ test -z "$srcdir" && srcdir=.
 
 PROJECT=Matchbox2
 TEST_TYPE=-d
-FILE=matchbox2
+FILE=matchbox
 
 test $TEST_TYPE $FILE || {
         echo "You must run this script in the top-level $PROJECT directory"

configure.ac

@@ -1,34 +1,28 @@
-# mbwm2 package version number, (as distinct from shared library version)
-# An odd minor number indicates in-progress development, (eg. from svn)
+# mbwm package version number, (as distinct from shared library version)
+# An odd minor number indicates in-progress development, (eg. from Git)
 # An even minor number indicates a released version.
-m4_define([mbwm2_major_version], [0])
-m4_define([mbwm2_minor_version], [1])
-m4_define([mbwm2_micro_version], [0])
+m4_define([mbwm_major_version], [1])
+m4_define([mbwm_minor_version], [9999])
+m4_define([mbwm_micro_version], [0])
 
-m4_define([mbwm2_version],
-          [mbwm2_major_version.mbwm2_minor_version.mbwm2_micro_version])
+m4_define([mbwm_version],
+          [mbwm_major_version.mbwm_minor_version.mbwm_micro_version])
 
-m4_define([mbwm2_api_version],
-          [mbwm2_major_version.mbwm2_minor_version])
+# Change this only when breaking the API
+m4_define([mbwm_api_version], [2.0])
 
 AC_PREREQ(2.63)
-AC_INIT([matchbox-window-manager-2], mbwm2_version, [mallum@handhelds.org])
-AC_CONFIG_SRCDIR([matchbox2/mb-window-manager.c])
+AC_INIT([matchbox], mbwm_version, [mallum@handhelds.org])
+AC_CONFIG_SRCDIR([matchbox/mb-window-manager.c])
 
 AM_INIT_AUTOMAKE(1.11 foreign dist-bzip2)
 AM_SILENT_RULES([yes])
 
-MBWM2_VERSION=mbwm2_version
-AC_SUBST(MBWM2_VERSION)
+MBWM_VERSION=mbwm_version
+AC_SUBST(MBWM_VERSION)
 
-MBWM2_API_VERSION=mbwm2_api_version
-AC_SUBST(MBWM2_API_VERSION)
-
-MBWM2_INCDIR=matchbox-wm-2/$MBWM2_API_VERSION/matchbox
-AC_SUBST(MBWM2_INCDIR)
-
-MBWM2_PKGINCDIR=matchbox-wm-2/$MBWM2_API_VERSION/
-AC_SUBST(MBWM2_PKGINCDIR)
+MBWM_API_VERSION=mbwm_api_version
+AC_SUBST(MBWM_API_VERSION)
 
 clutter_package="clutter-1.0 >= 1.5.6"
 
@@ -206,8 +200,8 @@ fi
 AC_SUBST(USE_GTK)
 
 PKG_CHECK_MODULES(MBWM, $needed_pkgs)
-MBWM2_PKGREQUIRES="$MBWM2_PKGREQUIRES $needed_pkgs"
-AC_SUBST(MBWM2_PKGREQUIRES)
+MBWM_PKGREQUIRES="$MBWM_PKGREQUIRES $needed_pkgs"
+AC_SUBST(MBWM_PKGREQUIRES)
 
 COMP_MGR_BACKEND=0
 ENABLE_COMPOSITE=0
@@ -249,7 +243,7 @@ AC_ARG_ENABLE(simple-manager,
   [  --disable-simple-manager   Do not build simple window manager],
   [simple_manager=$enableval],
   [
-    if test "x$libmatchbox2" = "xyes"; then
+    if test "x$libmatchbox" = "xyes"; then
         simple_manager=no
     else
         simple_manager=yes
@@ -273,14 +267,14 @@ PKG_CHECK_MODULES(XFIXES, xfixes >= 4.0, have_xfixes=yes, have_xfixes=no)
 
 if test x$have_xfixes = xyes; then
   AC_DEFINE(HAVE_XFIXES, [1], [Use XFixes ext to really hide cursor])
-  MBWM2_PKGREQUIRES="$MBWM2_PKGREQUIRES xfixes >= 0.4"
+  MBWM_PKGREQUIRES="$MBWM_PKGREQUIRES xfixes >= 0.4"
 fi
 
 PKG_CHECK_MODULES(XEXT, xext, have_xext=yes, have_xext=no)
 
 if test x$have_xext = xyes; then
   AC_DEFINE(HAVE_XEXT, [1], [Use Xext ext])
-  MBWM2_PKGREQUIRES="$MBWM2_PKGREQUIRES xext"
+  MBWM_PKGREQUIRES="$MBWM_PKGREQUIRES xext"
 fi
 
 PKG_CHECK_MODULES(XCURSOR, xcursor, have_xcursor=yes, have_xcursor=no)
@@ -289,28 +283,21 @@ if test x$have_xcursor = xyes; then
   AC_DEFINE(HAVE_XCURSOR, [1], [Use XCursor to sync pointer themes])
 fi
 
-MBWM_INCS='-I$(top_srcdir) -I$(top_srcdir)/matchbox2/core -I$(top_srcdir)/matchbox2/client-types -I$(top_srcdir)/matchbox2/theme-engines -I$(top_srcdir)/matchbox2/comp-mgr -I$(top_builddir)'
-MBWM_CORE_LIB='$(top_builddir)/matchbox2/core/libmatchbox-window-manager-2-core.la'
-MBWM_CLIENT_BUILDDIR='$(top_builddir)/matchbox2/client-types'
-MBWM_THEME_BUILDDIR='$(top_builddir)/matchbox2/theme-engines'
-MBWM_COMPMGR_BUILDDIR='$(top_builddir)/matchbox2/comp-mgr'
+MBWM_INCS='-I$(top_srcdir) -I$(top_srcdir)/matchbox -I$(top_builddir)'
 MBWM_CFLAGS="$MBWM_CFLAGS $MBWM_DEBUG_CFLAGS $XFIXES_CFLAGS $XEXT_CFLAGS $XCURSOR_CFLAGS"
 MBWM_LIBS="$MBWM_LIBS $XFIXES_LIBS $XEXT_LIBS $XCURSOR_LIBS $MBWM_EXTRA_LIBS"
 
 AC_SUBST([MBWM_CFLAGS])
 AC_SUBST([MBWM_LIBS])
-AC_SUBST([MBWM_CORE_LIB])
 AC_SUBST([MBWM_INCS])
-AC_SUBST([MBWM_CLIENT_BUILDDIR])
-AC_SUBST([MBWM_THEME_BUILDDIR])
-AC_SUBST([MBWM_COMPMGR_BUILDDIR])
 AC_SUBST([MBWM_DEBUG_CFLAGS])
 AC_SUBST([MBWM_DEBUG_LDFLAGS])
 
 AC_OUTPUT([
 Makefile
-matchbox2/Makefile
-matchbox2/mb-wm-config.h
+matchbox-$MBWM_API_VERSION.pc:matchbox.pc.in
+matchbox/Makefile
+matchbox/mb-wm-config.h
 managers/Makefile
 managers/simple/Makefile
 managers/maemo/Makefile
@@ -319,11 +306,10 @@ data/Makefile
 data/themes/Makefile
 data/themes/Default/Makefile
 data/themes/PngSample/Makefile
-data/libmatchbox2.pc
 doc/Makefile
 doc/reference/Makefile
-doc/reference/matchbox2/Makefile
-doc/reference/matchbox2/version.xml
+doc/reference/matchbox/Makefile
+doc/reference/matchbox/version.xml
 util/Makefile
 ])
 

data/Makefile.am

@@ -1,11 +1 @@
 SUBDIRS=themes
-
-pcfiles = libmatchbox2-@MBWM2_API_VERSION@.pc \
-	  libmatchbox2.pc
-
-# clutter-<major>.<minor>.pc - for generic dependencies
-libmatchbox2-@MBWM2_API_VERSION@.pc: libmatchbox2.pc
-	@cp $< $@
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(pcfiles)

data/libmatchbox2.pc.in

@@ -1,14 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/@MBWM2_PKGINCDIR@
-localedir=@localedir@
-apiversion=@MBWM2_API_VERSION@
-requires=@MBWM2_PKGREQUIRES@
-
-Name: libmatchbox
-Description: Framework to build window managers not on the Desktop.
-Requires: ${requires}
-Version: @VERSION@
-Libs: -L${libdir} -lmatchbox2-${apiversion}
-Cflags: -I${includedir}

doc/reference/Makefile.am

@@ -1 +1 @@
-SUBDIRS=matchbox2
+SUBDIRS=matchbox

doc/reference/matchbox/Makefile.am

@@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = 1.6
 # of using the various options.
 
 # The name of the module, e.g. 'glib'.
-DOC_MODULE=matchbox2
+DOC_MODULE=matchbox
 
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
@@ -18,14 +18,14 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../../matchbox2
+DOC_SOURCE_DIR=../../../matchbox
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=--deprecated-guards="MATCHBOX2_DISABLE_DEPRECATED"
+SCAN_OPTIONS=--deprecated-guards="MATCHBOX_DISABLE_DEPRECATED"
 
 # Extra options to supply to gtkdoc-mkdb.
 # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
@@ -44,12 +44,12 @@ FIXXREF_OPTIONS=\
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/matchbox2/*.h
+HFILE_GLOB=$(top_srcdir)/matchbox/*.h
 CFILE_GLOB=
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=$(top_srcdir)/matchbox2/*-private.h
+IGNORE_HFILES=$(top_srcdir)/matchbox/*-private.h
 
 EXTRA_HFILES=
 
@@ -74,10 +74,10 @@ expand_content_files=
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 
 INCLUDES=\
-	@MBWM_INCS@
+	$(MBWM_INCS) $(MBWM_CFLAGS)
 GTKDOC_LIBS=\
 	@MBWM_LIBS@ \
-	$(top_builddir)/matchbox2/libmatchbox2-@MBWM2_API_VERSION@.la
+	$(top_builddir)/matchbox/libmatchbox-@MBWM_API_VERSION@.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make

doc/reference/matchbox/version.xml.in

@@ -0,0 +1 @@
+@MBW2_VERSION@

doc/reference/matchbox2/version.xml.in

@@ -1 +0,0 @@
-@MBWM2_VERSION@

managers/maemo/Makefile.am

@@ -17,5 +17,5 @@ matchbox_window_manager_2_maemo_LDFLAGS = \
 	$(LDFLAGS)
 
 matchbox_window_manager_2_maemo_LDADD = \
-	$(top_builddir)/matchbox2/libmatchbox2-@MBWM2_API_VERSION@.la \
+	$(top_builddir)/matchbox/libmatchbox-@MBWM_API_VERSION@.la \
 	$(MBWM_LIBS)

managers/maemo/maemo-input.h

@@ -21,7 +21,7 @@
 #ifndef _HAVE_MAEMO_INPUT_H
 #define _HAVE_MAEMO_INPUT_H
 
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
 
 typedef struct MaemoInput      MaemoInput;
 typedef struct MaemoInputClass MaemoInputClass;

managers/maemo/maemo-toolbar.h

@@ -21,7 +21,7 @@
 #ifndef _HAVE_MAEMO_TOOLBAR_H
 #define _HAVE_MAEMO_TOOLBAR_H
 
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
 
 typedef struct MaemoToolbar      MaemoToolbar;
 typedef struct MaemoToolbarClass MaemoToolbarClass;

managers/maemo/maemo-window-manager.c

@@ -21,7 +21,7 @@
 #include "maemo-window-manager.h"
 #include "maemo-toolbar.h"
 #include "maemo-input.h"
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
 
 #include <stdarg.h>
 

managers/maemo/maemo-window-manager.h

@@ -21,7 +21,7 @@
 #ifndef _HAVE_MAEMO_WINDOW_MANAGER_H
 #define _HAVE_MAEMO_WINDOW_MANAGER_H
 
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
 
 typedef struct MaemoWindowManager        MaemoWindowManager;
 typedef struct MaemoWindowManagerClass   MaemoWindowManagerClass;

managers/maemo/matchbox-window-manager-2-maemo.c

@@ -18,7 +18,7 @@
  *
  */
 
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
 #include <signal.h>
 
 enum {

managers/simple/Makefile.am

@@ -12,6 +12,6 @@ matchbox_window_manager_2_simple_LDFLAGS = \
 	$(LDFLAGS)
 
 matchbox_window_manager_2_simple_LDADD = \
-	$(top_builddir)/matchbox2/libmatchbox2-@MBWM2_API_VERSION@.la \
+	$(top_builddir)/matchbox/libmatchbox-@MBWM_API_VERSION@.la \
 	$(MBWM_LIBS)
 

managers/simple/matchbox-window-manager-2-simple.c

@@ -1,4 +1,4 @@
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
 #include <signal.h>
 
 #if ENABLE_CLUTTER_COMPOSITE_MANAGER

matchbox.pc.in

@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/matchbox-@MBWM_API_VERSION@/matchbox
+localedir=@localedir@
+apiversion=@MBWM_API_VERSION@
+requires=@MBWM_PKGREQUIRES@
+
+Name: Matchbox
+Description: Framework to build window and composite managers.
+Requires: ${requires}
+Version: @VERSION@
+Libs: -L${libdir} -lmatchbox-${apiversion}
+Cflags: -I${includedir}

matchbox/Makefile.am

@@ -1,5 +1,5 @@
 
-lib_LTLIBRARIES = libmatchbox2-@MBWM2_API_VERSION@.la
+lib_LTLIBRARIES = libmatchbox-@MBWM_API_VERSION@.la
 
 source_public_h = \
   matchbox.h
@@ -92,10 +92,10 @@ if THEME_PNG
 source += mb-wm-theme-png.c mb-wm-theme-png.h
 endif
 
-pkgincludedir = $(includedir)/matchbox2-$(MBWM2_API_VERSION)/matchbox2
+pkgincludedir = $(includedir)/matchbox-$(MBWM_API_VERSION)/matchbox
 pkginclude_HEADERS = $(source_public_h)
 
-libmatchbox2_@MBWM2_API_VERSION@_la_SOURCES = $(source_public_h) $(source)
-libmatchbox2_@MBWM2_API_VERSION@_la_CFLAGS = $(MBWM_INCS) $(MBWM_CFLAGS) -DDATADIR=\"$(datadir)\"
-libmatchbox2_@MBWM2_API_VERSION@_la_LIBADD = $(MBWM_LIBS)
+libmatchbox_@MBWM_API_VERSION@_la_SOURCES = $(source_public_h) $(source)
+libmatchbox_@MBWM_API_VERSION@_la_CFLAGS = $(MBWM_INCS) $(MBWM_CFLAGS) -DDATADIR=\"$(datadir)\"
+libmatchbox_@MBWM_API_VERSION@_la_LIBADD = $(MBWM_LIBS)
 

matchbox/matchbox.h

@@ -31,8 +31,8 @@
 #include <X11/Xatom.h>          /* for XA_ATOM etc */
 #include <X11/keysym.h>         /* key mask defines */
 
-#include <matchbox2/mb-wm-config.h>
-#include <matchbox2/xas.h>    		/* async stuff not needed for xlib on xcb */
+#include <matchbox/mb-wm-config.h>
+#include <matchbox/xas.h>    		/* async stuff not needed for xlib on xcb */
 
 #ifndef TRUE
 #define TRUE 1
@@ -42,29 +42,29 @@
 #define FALSE 0
 #endif
 
-#include <matchbox2/mb-wm-macros.h>
-#include <matchbox2/mb-wm-debug.h>
-#include <matchbox2/mb-wm-types.h>
-#include <matchbox2/mb-wm-util.h>
-#include <matchbox2/mb-wm-object.h>
-#include <matchbox2/mb-wm-atoms.h>
-#include <matchbox2/mb-wm-props.h>
-#include <matchbox2/mb-wm-keys.h>
-#include <matchbox2/mb-wm-decor.h>
-#include <matchbox2/mb-wm-client-window.h>
-#include <matchbox2/mb-wm-root-window.h>
-#include <matchbox2/mb-wm-client.h>
-#include <matchbox2/mb-wm-client-base.h>
-#include <matchbox2/mb-wm-client-app.h>
-#include <matchbox2/mb-wm-client-desktop.h>
-#include <matchbox2/mb-wm-client-dialog.h>
-#include <matchbox2/mb-wm-client-input.h>
-#include <matchbox2/mb-wm-client-menu.h>
-#include <matchbox2/mb-wm-client-note.h>
-#include <matchbox2/mb-wm-client-override.h>
-#include <matchbox2/mb-wm-client-panel.h>
-#include <matchbox2/mb-wm-layout.h>
-#include <matchbox2/mb-wm-stack.h>
-#include <matchbox2/mb-window-manager.h>
-#include <matchbox2/mb-wm-main-context.h>
+#include <matchbox/mb-wm-macros.h>
+#include <matchbox/mb-wm-debug.h>
+#include <matchbox/mb-wm-types.h>
+#include <matchbox/mb-wm-util.h>
+#include <matchbox/mb-wm-object.h>
+#include <matchbox/mb-wm-atoms.h>
+#include <matchbox/mb-wm-props.h>
+#include <matchbox/mb-wm-keys.h>
+#include <matchbox/mb-wm-decor.h>
+#include <matchbox/mb-wm-client-window.h>
+#include <matchbox/mb-wm-root-window.h>
+#include <matchbox/mb-wm-client.h>
+#include <matchbox/mb-wm-client-base.h>
+#include <matchbox/mb-wm-client-app.h>
+#include <matchbox/mb-wm-client-desktop.h>
+#include <matchbox/mb-wm-client-dialog.h>
+#include <matchbox/mb-wm-client-input.h>
+#include <matchbox/mb-wm-client-menu.h>
+#include <matchbox/mb-wm-client-note.h>
+#include <matchbox/mb-wm-client-override.h>
+#include <matchbox/mb-wm-client-panel.h>
+#include <matchbox/mb-wm-layout.h>
+#include <matchbox/mb-wm-stack.h>
+#include <matchbox/mb-window-manager.h>
+#include <matchbox/mb-wm-main-context.h>
 #endif

matchbox/mb-window-manager.h

@@ -21,17 +21,17 @@
 #ifndef _HAVE_MB_WM_WINDOW_MANAGER_H
 #define _HAVE_MB_WM_WINDOW_MANAGER_H
 
-#include <matchbox2/mb-wm-config.h>
-#include <matchbox2/mb-wm-object.h>
-#include <matchbox2/mb-wm-keys.h>
-#include <matchbox2/mb-wm-root-window.h>
-#include <matchbox2/mb-wm-theme.h>
-#include <matchbox2/mb-wm-layout.h>
-#include <matchbox2/mb-wm-main-context.h>
+#include <matchbox/mb-wm-config.h>
+#include <matchbox/mb-wm-object.h>
+#include <matchbox/mb-wm-keys.h>
+#include <matchbox/mb-wm-root-window.h>
+#include <matchbox/mb-wm-theme.h>
+#include <matchbox/mb-wm-layout.h>
+#include <matchbox/mb-wm-main-context.h>
 #if ENABLE_COMPOSITE
-#include <matchbox2/mb-wm-comp-mgr.h>
+#include <matchbox/mb-wm-comp-mgr.h>
 #endif
-#include <matchbox2/xas.h>
+#include <matchbox/xas.h>
 
 /* XXX: we have a circular dependency between mb-wm-main-context.h
  * and mb-window-manager.h  */

matchbox/mb-wm-atoms.h

@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_WM_ATOMS_H
 #define _HAVE_MB_WM_ATOMS_H
 
-#include <matchbox2/mb-window-manager.h>
+#include <matchbox/mb-window-manager.h>
 
 void
 mb_wm_atoms_init(MBWindowManager *wm);

matchbox/mb-wm-client-app.h

@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_APP_H
 #define _HAVE_MB_CLIENT_APP_H
 
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
 
 typedef struct MBWMClientApp      MBWMClientApp;
 typedef struct MBWMClientAppClass MBWMClientAppClass;

matchbox/mb-wm-client-base.h

@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_WM_CLIENT_BASE_H
 #define _HAVE_MB_WM_CLIENT_BASE_H
 
-#include <matchbox2/mb-wm-client.h>
+#include <matchbox/mb-wm-client.h>
 
 #define MB_WM_CLIENT_BASE(c) ((MBWMClientBase*)(c))
 #define MB_WM_CLIENT_BASE_CLASS(c) ((MBWMClientBaseClass*)(c))

matchbox/mb-wm-client-desktop.h

@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_DESKTOP_H
 #define _HAVE_MB_CLIENT_DESKTOP_H
 
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
 
 typedef struct MBWMClientDesktop      MBWMClientDesktop;
 typedef struct MBWMClientDesktopClass MBWMClientDesktopClass;

matchbox/mb-wm-client-dialog.h

@@ -21,8 +21,8 @@
 #ifndef _HAVE_MB_CLIENT_DIALOG_H
 #define _HAVE_MB_CLIENT_DIALOG_H
 
-#include <matchbox2/mb-wm-client-base.h>
-#include <matchbox2/mb-wm-decor.h>
+#include <matchbox/mb-wm-client-base.h>
+#include <matchbox/mb-wm-decor.h>
 
 #define MB_WM_CLIENT_DIALOG(c) ((MBWMClientDialog*)(c))
 #define MB_WM_CLIENT_DIALOG_CLASS(c) ((MBWMClientDialogClass*)(c))

matchbox/mb-wm-client-input.h

@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_INPUT_H
 #define _HAVE_MB_CLIENT_INPUT_H
 
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
 
 typedef struct MBWMClientInput      MBWMClientInput;
 typedef struct MBWMClientInputClass MBWMClientInputClass;

matchbox/mb-wm-client-menu.h

@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_MENU_H
 #define _HAVE_MB_CLIENT_MENU_H
 
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
 
 typedef struct MBWMClientMenu      MBWMClientMenu;
 typedef struct MBWMClientMenuClass MBWMClientMenuClass;

matchbox/mb-wm-client-note.h

@@ -21,8 +21,8 @@
 #ifndef _HAVE_MB_CLIENT_NOTE_H
 #define _HAVE_MB_CLIENT_NOTE_H
 
-#include <matchbox2/matchbox.h>
-#include <matchbox2/mb-wm-client-dialog.h>
+#include <matchbox/matchbox.h>
+#include <matchbox/mb-wm-client-dialog.h>
 
 typedef struct MBWMClientNote      MBWMClientNote;
 typedef struct MBWMClientNoteClass MBWMClientNoteClass;

matchbox/mb-wm-client-override.h

@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_OVERRIDE_H
 #define _HAVE_MB_CLIENT_OVERRIDE_H
 
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
 
 typedef struct MBWMClientOverride      MBWMClientOverride;
 typedef struct MBWMClientOverrideClass MBWMClientOverrideClass;

matchbox/mb-wm-client-panel.h

@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_PANEL_H
 #define _HAVE_MB_CLIENT_PANEL_H
 
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
 
 typedef struct MBWMClientPanel      MBWMClientPanel;
 typedef struct MBWMClientPanelClass MBWMClientPanelClass;

matchbox/mb-wm-client-window.h

@@ -21,8 +21,8 @@
 #ifndef _HAVE_MB_WM_CLIENT_WINDOW_H
 #define _HAVE_MB_WM_CLIENT_WINDOW_H
 
-#include <matchbox2/mb-wm-object.h>
-#include <matchbox2/mb-wm-types.h>
+#include <matchbox/mb-wm-object.h>
+#include <matchbox/mb-wm-types.h>
 
 /* FIXME: below limits to 32 props */
 

matchbox/mb-wm-client.h

@@ -21,10 +21,10 @@
 #ifndef _HAVE_MB_CLIENT_H
 #define _HAVE_MB_CLIENT_H
 
-#include <matchbox2/mb-wm-client-window.h>
-#include <matchbox2/mb-wm-config.h>
+#include <matchbox/mb-wm-client-window.h>
+#include <matchbox/mb-wm-config.h>
 #if ENABLE_COMPOSITE
-#include <matchbox2/mb-wm-comp-mgr.h>
+#include <matchbox/mb-wm-comp-mgr.h>
 #endif
 
 /* XXX: We have a circular dependency between mb-wm-comp-mgr.h

matchbox/mb-wm-comp-mgr-clutter.h

@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_WM_COMP_MGR_CLUTTER_H
 #define _HAVE_MB_WM_COMP_MGR_CLUTTER_H
 
-#include <matchbox2/mb-wm-config.h>
+#include <matchbox/mb-wm-config.h>
 #include <clutter/clutter.h>
 
 #define MB_WM_COMP_MGR_CLUTTER(c) ((MBWMCompMgrClutter*)(c))

matchbox/mb-wm-comp-mgr-xrender.h

@@ -22,7 +22,7 @@
 #ifndef _HAVE_MB_WM_COMP_MGR_DEFAULT_H
 #define _HAVE_MB_WM_COMP_MGR_DEFAULT_H
 
-#include <matchbox2/mb-wm-config.h>
+#include <matchbox/mb-wm-config.h>
 
 #define MB_WM_COMP_MGR_DEFAULT(c) ((MBWMCompMgrDefault*)(c))
 #define MB_WM_COMP_MGR_DEFAULT_CLASS(c) ((MBWMCompMgrDefaultClass*)(c))

matchbox/mb-wm-comp-mgr.h

@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_WM_COMP_MGR_H
 #define _HAVE_MB_WM_COMP_MGR_H
 
-#include <matchbox2/mb-wm-client.h>
+#include <matchbox/mb-wm-client.h>
 
 #include <X11/extensions/Xdamage.h>
 

matchbox/mb-wm-decor.h

@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_WM_DECOR_H
 #define _HAVE_MB_WM_DECOR_H
 
-#include <matchbox2/mb-wm-client.h>
+#include <matchbox/mb-wm-client.h>
 
 #define MB_WM_DECOR(c) ((MBWMDecor*)(c))
 #define MB_WM_DECOR_CLASS(c) ((MBWMDecorClass*)(c))

matchbox/mb-wm-keys.h

@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_WM_KEYS_H
 #define _HAVE_MB_WM_KEYS_H
 
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
 
 typedef struct MBWMKeys       MBWMKeys;
 typedef struct MBWMKeyBinding MBWMKeyBinding;

matchbox/mb-wm-layout.h

@@ -21,8 +21,8 @@
 #ifndef _HAVE_MB_WM_LAYOUT_MANAGER_H
 #define _HAVE_MB_WM_LAYOUT_MANAGER_H
 
-#include <matchbox2/mb-wm-object.h>
-#include <matchbox2/mb-wm-types.h>
+#include <matchbox/mb-wm-object.h>
+#include <matchbox/mb-wm-types.h>
 
 #define MB_WM_LAYOUT(c) ((MBWMLayout*)(c))
 #define MB_WM_LAYOUT_CLASS(c) ((MBWMLayoutClass*)(c))

matchbox/mb-wm-main-context.h

@@ -21,8 +21,8 @@
 #ifndef _HAVE_MB_MAIN_CONTEXT_H
 #define _HAVE_MB_MAIN_CONTEXT_H
 
-#include <matchbox2/mb-wm-object.h>
-#include <matchbox2/mb-window-manager.h>
+#include <matchbox/mb-wm-object.h>
+#include <matchbox/mb-window-manager.h>
 #include <poll.h>
 
 #define MB_WM_MAIN_CONTEXT(c) ((MBWMMainContext*)(c))

matchbox/mb-wm-object-props.h

@@ -2,7 +2,7 @@
 #ifndef _HAVE_MB_OBJECT_PROPS_H
 #define _HAVE_MB_OBJECT_PROPS_H
 
-#include <matchbox2/mb-wm-types.h>
+#include <matchbox/mb-wm-types.h>
 
 /*
  * MBWMObject construction properties

matchbox/mb-wm-object.h

@@ -22,7 +22,7 @@
 #define _HAVE_MB_OBJECT_H
 
 #include <stdarg.h>
-#include <matchbox2/mb-wm-object-props.h>
+#include <matchbox/mb-wm-object-props.h>
 
 typedef struct MBWMObject       MBWMObject;
 typedef struct MBWMObjectClass  MBWMObjectClass;

matchbox/mb-wm-root-window.h

@@ -21,8 +21,8 @@
 #ifndef _HAVE_MB_WM_ROOT_WINDOW_H
 #define _HAVE_MB_WM_ROOT_WINDOW_H
 
-#include <matchbox2/mb-wm-object.h>
-#include <matchbox2/mb-window-manager.h>
+#include <matchbox/mb-wm-object.h>
+#include <matchbox/mb-window-manager.h>
 
 typedef struct MBWMRootWindow        MBWMRootWindow;
 typedef struct MBWMRootWindowClass   MBWMRootWindowClass;

matchbox/mb-wm-theme-png.h

@@ -21,8 +21,8 @@
 #ifndef _HAVE_MB_WM_THEME_PNG_H
 #define _HAVE_MB_WM_THEME_PNG_H
 
-#include <matchbox2/mb-wm-config.h>
-#include <matchbox2/mb-wm-theme.h>
+#include <matchbox/mb-wm-config.h>
+#include <matchbox/mb-wm-theme.h>
 
 #include <X11/extensions/Xrender.h>
 

matchbox/mb-wm-theme-xml.h

@@ -1,8 +1,8 @@
 #ifndef _HAVE_MB_WM_THEME_PRIVATE_H
 #define _HAVE_MB_WM_THEME_PRIVATE_H
 
-#include <matchbox2/matchbox.h>
-#include <matchbox2/mb-wm-theme.h>
+#include <matchbox/matchbox.h>
+#include <matchbox/mb-wm-theme.h>
 /*
  * Helper structs for xml theme
  */

matchbox/mb-wm-theme.h

@@ -21,9 +21,9 @@
 #ifndef _HAVE_MB_WM_THEME_H
 #define _HAVE_MB_WM_THEME_H
 
-#include <matchbox2/mb-wm-config.h>
-#include <matchbox2/mb-wm-object.h>
-#include <matchbox2/mb-wm-decor.h>
+#include <matchbox/mb-wm-config.h>
+#include <matchbox/mb-wm-object.h>
+#include <matchbox/mb-wm-decor.h>
 
 #define MB_WM_THEME(c) ((MBWMTheme*)(c))
 #define MB_WM_THEME_CLASS(c) ((MBWMThemeClass*)(c))

matchbox/mb-wm-types.h

@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_WM_TYPES_H
 #define _HAVE_MB_WM_TYPES_H
 
-#include <matchbox2/mb-wm-config.h>
+#include <matchbox/mb-wm-config.h>
 
 #if USE_GLIB_MAINLOOP
 #include <glib.h>

matchbox/mb-wm-util.h

@@ -1,8 +1,8 @@
 #ifndef _MB_HAVE_UTIL_H
 #define _MB_HAVE_UTIL_H
 
-#include <matchbox2/mb-wm-config.h>
-#include <matchbox2/mb-wm-types.h>
+#include <matchbox/mb-wm-config.h>
+#include <matchbox/mb-wm-types.h>
 
 /* See http://rlove.org/log/2005102601 */
 #if __GNUC__ >= 3