aboutsummaryrefslogtreecommitdiffstats
path: root/managers
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2010-08-18 02:25:49 +0100
committerRobert Bragg <robert@linux.intel.com>2010-12-09 22:38:47 +0000
commit7d2876023f9825f0dc743a6841c1d91e083a5afa (patch)
tree6999d19f874072b43e02752d58723c3d7473863f /managers
parent1356ae017f9569ab69068e1834a73c38d5e486c8 (diff)
downloadlibmatchboxwm2-7d2876023f9825f0dc743a6841c1d91e083a5afa.tar.gz
libmatchboxwm2-7d2876023f9825f0dc743a6841c1d91e083a5afa.tar.bz2
libmatchboxwm2-7d2876023f9825f0dc743a6841c1d91e083a5afa.zip
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
Diffstat (limited to 'managers')
-rw-r--r--managers/maemo/Makefile.am2
-rw-r--r--managers/maemo/maemo-input.h2
-rw-r--r--managers/maemo/maemo-toolbar.h2
-rw-r--r--managers/maemo/maemo-window-manager.c2
-rw-r--r--managers/maemo/maemo-window-manager.h2
-rw-r--r--managers/maemo/matchbox-window-manager-2-maemo.c2
-rw-r--r--managers/simple/Makefile.am2
-rw-r--r--managers/simple/matchbox-window-manager-2-simple.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/managers/maemo/Makefile.am b/managers/maemo/Makefile.am
index 45967b5..dc698d6 100644
--- a/managers/maemo/Makefile.am
+++ b/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)
diff --git a/managers/maemo/maemo-input.h b/managers/maemo/maemo-input.h
index 079467f..73ea2a2 100644
--- a/managers/maemo/maemo-input.h
+++ b/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;
diff --git a/managers/maemo/maemo-toolbar.h b/managers/maemo/maemo-toolbar.h
index 9bfd788..c5267c1 100644
--- a/managers/maemo/maemo-toolbar.h
+++ b/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;
diff --git a/managers/maemo/maemo-window-manager.c b/managers/maemo/maemo-window-manager.c
index 5660237..62e0107 100644
--- a/managers/maemo/maemo-window-manager.c
+++ b/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>
diff --git a/managers/maemo/maemo-window-manager.h b/managers/maemo/maemo-window-manager.h
index c3ebe78..ce67597 100644
--- a/managers/maemo/maemo-window-manager.h
+++ b/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;
diff --git a/managers/maemo/matchbox-window-manager-2-maemo.c b/managers/maemo/matchbox-window-manager-2-maemo.c
index 6656e40..6998dd1 100644
--- a/managers/maemo/matchbox-window-manager-2-maemo.c
+++ b/managers/maemo/matchbox-window-manager-2-maemo.c
@@ -18,7 +18,7 @@
*
*/
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
#include <signal.h>
enum {
diff --git a/managers/simple/Makefile.am b/managers/simple/Makefile.am
index 745ba8c..f035108 100644
--- a/managers/simple/Makefile.am
+++ b/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)
diff --git a/managers/simple/matchbox-window-manager-2-simple.c b/managers/simple/matchbox-window-manager-2-simple.c
index 9b4ce11..5b68cde 100644
--- a/managers/simple/matchbox-window-manager-2-simple.c
+++ b/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