[telepathy-mission-control/master] Never build libmissioncontrol-client (aka libmissioncontrol)

[Simon McVittie]

---
 Makefile.am               |    7 -------
 configure.ac              |   20 --------------------
 doc/reference/Makefile.am |    3 ---
 test/Makefile.am          |    6 ------
 4 files changed, 0 insertions(+), 36 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5530e4f..234810e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,10 +2,6 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = m4 tools xml libmcclient src server util
 
-if HAVE_LEGACY
-SUBDIRS += libmissioncontrol
-endif
-
 if HAVE_EXAMPLES
 SUBDIRS += examples
 endif
@@ -14,9 +10,6 @@ SUBDIRS += doc test
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libmcclient.pc mission-control.pc
-if HAVE_LEGACY
-pkgconfig_DATA += libmissioncontrol.pc
-endif
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
diff --git a/configure.ac b/configure.ac
index e2e8fb2..1f89b9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,26 +213,6 @@ PKG_CHECK_MODULES(TELEPATHY, telepathy-glib >= 0.7.26)
 AC_SUBST(TELEPATHY_LIBS)
 AC_SUBST(TELEPATHY_CFLAGS)
 
-legacy_enabled="yes"
-AC_MSG_CHECKING(whether to build the old libmissioncontrol-client)
-AC_ARG_ENABLE(legacy,
-	[  --enable-legacy         build libmiccioncontrol-client. default=yes],
-	[
-		AC_MSG_RESULT(${enableval})
-		legacy_enabled="${enableval}"
-	],
-	[
-		AC_MSG_RESULT(yes)
-		legacy_enabled="yes"
-	]
-)
-AM_CONDITIONAL(HAVE_LEGACY, [test x$legacy_enabled = xyes])
-if test "x$legacy_enabled" = "xyes"; then
-    PKG_CHECK_MODULES(LIBTELEPATHY, libtelepathy >= 0.3.0)
-    AC_SUBST(LIBTELEPATHY_LIBS)
-    AC_SUBST(LIBTELEPATHY_CFLAGS)
-fi
-
 GCONF_REQUIRED_VERSION=2.0.0
 PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED_VERSION)
 AC_SUBST(GCONF_CFLAGS)
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 03ccd67..78f7a9f 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -1,4 +1 @@
 SUBDIRS = libmcclient libmissioncontrol-server
-if HAVE_LEGACY
-SUBDIRS += libmissioncontrol
-endif
diff --git a/test/Makefile.am b/test/Makefile.am
index c65cf43..a2bec54 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -7,10 +7,4 @@ if HAVE_TESTS
 
 SUBDIRS = twisted
 
-if HAVE_LEGACY
-noinst_PROGRAMS = mc-client
-mc_client_SOURCES = mc-client.c
-mc_client_LDADD = $(top_builddir)/libmissioncontrol/libmissioncontrol-client.la
-endif
-
 endif
-- 
1.5.6.5