From 44dc7459c2be3c70e9773915936c53b8133085ee Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 27 Sep 2013 17:10:13 +0100
Subject: [PATCH 09/22] Bump plugin API/ABI and generally be
 parallel-installable

---
 configure.ac                                      |  4 ++--
 doc/reference/mission-control-plugins/Makefile.am |  2 +-
 mission-control-plugins/Makefile.am               | 18 +++++++++---------
 server/Makefile.am                                |  2 +-
 src/Makefile.am                                   |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index a3d9d2b..8ec15e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ esac
 # If API has been removed or changed since last release, change MCP_API (which
 # is part of the directory name under /usr/include) to the version that
 # changed it
-MCP_API_VERSION=5.15
+MCP_API_VERSION=6
 AC_SUBST([MCP_API_VERSION])
 
 # If ABI has been removed or changed since last release
@@ -46,7 +46,7 @@ AC_SUBST([MCP_API_VERSION])
 #     set revision to 0
 # else if library source has changed since last release
 #     increment revision
-MCP_LT_CURRENT=6
+MCP_LT_CURRENT=0
 MCP_LT_REVISION=0
 MCP_LT_AGE=0
 AC_SUBST([MCP_LT_CURRENT])
diff --git a/doc/reference/mission-control-plugins/Makefile.am b/doc/reference/mission-control-plugins/Makefile.am
index 061d1b7..7beac7c 100644
--- a/doc/reference/mission-control-plugins/Makefile.am
+++ b/doc/reference/mission-control-plugins/Makefile.am
@@ -84,7 +84,7 @@ GTKDOC_CFLAGS = \
     $(DBUS_CFLAGS) \
     $(GLIB_CFLAGS)
 GTKDOC_LIBS = \
-    $(top_builddir)/mission-control-plugins/libmission-control-plugins.la \
+    $(top_builddir)/mission-control-plugins/libmission-control-plugins-6.la \
     $(TELEPATHY_LIBS) \
     $(DBUS_LIBS) \
     $(GLIB_LIBS)
diff --git a/mission-control-plugins/Makefile.am b/mission-control-plugins/Makefile.am
index ae4c848..1312467 100644
--- a/mission-control-plugins/Makefile.am
+++ b/mission-control-plugins/Makefile.am
@@ -12,7 +12,7 @@ AM_CFLAGS = $(ERROR_CFLAGS)
 
 EXTRA_DIST = mcp-signals-marshal.list
 
-lib_LTLIBRARIES = libmission-control-plugins.la
+lib_LTLIBRARIES = libmission-control-plugins-6.la
 
 plugins_includedir = \
 	$(includedir)/mission-control-@MCP_API_VERSION@/mission-control-plugins
@@ -33,21 +33,21 @@ nodist_plugins_include_HEADERS = \
 	mcp-signals-marshal.h \
 	$(NULL)
 
-libmission_control_plugins_la_LDFLAGS = \
+libmission_control_plugins_6_la_LDFLAGS = \
 	-export-symbols-regex "^(mcp_)" \
 	-no-undefined -version-info "@MCP_LT_CURRENT@":"@MCP_LT_REVISION@":"@MCP_LT_AGE@"
 
-libmission_control_plugins_la_LIBADD = \
+libmission_control_plugins_6_la_LIBADD = \
 	$(TELEPATHY_LIBS) \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-nodist_libmission_control_plugins_la_SOURCES = \
+nodist_libmission_control_plugins_6_la_SOURCES = \
 	mcp-signals-marshal.c \
 	mcp-signals-marshal.h
 
-libmission_control_plugins_la_SOURCES = \
+libmission_control_plugins_6_la_SOURCES = \
 	debug-internal.h \
 	debug.h \
 	debug.c \
@@ -60,17 +60,17 @@ libmission_control_plugins_la_SOURCES = \
 	request.c \
 	request-policy.c
 
-BUILT_SOURCES = $(nodist_libmission_control_plugins_la_SOURCES)
+BUILT_SOURCES = $(nodist_libmission_control_plugins_6_la_SOURCES)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer -:PROJECT telepathy-mission-control \
-	 -:SHARED libmission-control-plugins \
+	 -:SHARED libmission-control-plugins-6 \
 	 -:TAGS eng debug \
 	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(BUILT_SOURCES) $(libmission_control_plugins_la_SOURCES) \
+	 -:SOURCES $(BUILT_SOURCES) $(libmission_control_plugins_6_la_SOURCES) \
 	 -:CFLAGS $(DEFAULT_INCLUDES) $(DEFS) $(CFLAGS) $(AM_CFLAGS) \
 	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
-	 -:LDFLAGS $(libmission_control_plugins_la_LIBADD) \
+	 -:LDFLAGS $(libmission_control_plugins_6_la_LIBADD) \
 	> $@
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/server/Makefile.am b/server/Makefile.am
index 2bc2291..e2af72d 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -41,7 +41,7 @@ mission_control_6_LDADD = \
 	$(TELEPATHY_LIBS) \
 	$(DBUS_LIBS) \
 	$(top_builddir)/src/libmcd-convenience.la \
-	$(top_builddir)/mission-control-plugins/libmission-control-plugins.la
+	$(top_builddir)/mission-control-plugins/libmission-control-plugins-6.la
 
 Android.mk: Makefile.am
 	androgenizer -:PROJECT telepathy-mission-control \
diff --git a/src/Makefile.am b/src/Makefile.am
index c237518..ae47d7e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -86,7 +86,7 @@ CLEANFILES = \
 	$(NULL)
 
 libmcd_convenience_la_LIBADD = \
-	$(top_builddir)/mission-control-plugins/libmission-control-plugins.la \
+	$(top_builddir)/mission-control-plugins/libmission-control-plugins-6.la \
 	$(TELEPATHY_LIBS) \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
-- 
1.8.4.rc3