[vinagre/no-separate-plugins: 5/9] Remove gobject-introspection support

[David King <davidk src gnome org>]

commit d8a571f22c5a0085ee49152f861df3e98c0145da
Author: David King <amigadave amigadave com>
Date:   Fri Jun 10 20:57:04 2011 +0200

    Remove gobject-introspection support

 Makefile.am  |   34 +---------------------------------
 configure.ac |   10 ----------
 2 files changed, 1 insertions(+), 43 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 883af26..7f42690 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,6 @@ common_cppflags = \
 	-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
 	-DSSH_PROGRAM=\"$(SSH_PROGRAM)\" \
 	$(VINAGRE_CFLAGS) \
-	$(INTROSPECTION_CFLAGS) \
 	$(WARN_FLAGS) \
 	$(DISABLE_DEPRECATED_FLAGS)
 
@@ -39,7 +38,6 @@ vinagre_vinagre_LDADD = \
 	libvinagre.la \
 	$(VINAGRE_LIBS) \
 	$(GTKVNC_LIBS) \
-	$(INTROSPECTION_LIBS)
 	$(rdp_plugin) \
 	$(spice_plugin) \
 	$(ssh_plugin) \
@@ -79,10 +77,6 @@ vinagreh_HEADERS = \
 	vinagre/vinagre-protocol.h \
 	vinagre/vinagre-plugins-engine.h
 
-INTROSPECTION_GIR_INCLUDES = \
-	Gtk-3.0 \
-	libxml2-2.0
-
 # The main library
 noinst_LTLIBRARIES = libvinagre.la
 
@@ -135,32 +129,6 @@ handwritten_sources += \
 noinst_vinagreh_headers += \
 	vinagre/vinagre-tubes-manager.h \
 	vinagre/vinagre-tube-handler.h
-INTROSPECTION_GIR_INCLUDES += TelepathyGLib-0.12
-endif
-
-CLEANFILES =
-
-# Introspection
-if VINAGRE_HAVE_INTROSPECTION
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS = Vinagre-3.0.gir
-
-Vinagre-3.0.gir: libvinagre.la
-INTROSPECTION_SCANNER_ARGS = $(common_cppflags) $(VINAGRE_CFLAGS) -I$(top_srcdir) --warn-all
-Vinagre_3_0_gir_LIBS = libvinagre.la
-Vinagre_3_0_gir_FILES = $(vinagreh_HEADERS) $(filter-out pty_open.h, $(noinst_vinagreh_headers)) $(handwritten_sources)
-Vinagre_3_0_gir_INCLUDES = $(INTROSPECTION_GIR_INCLUDES)
-
-girdir = $(pkgdatadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(libdir)/vinagre- VINAGRE_ABI_VERSION@/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += \
-	$(gir_DATA) \
-	$(typelib_DATA)
-
 endif
 
 plugindir = $(VINAGRE_PLUGINS_LIBS_DIR)
@@ -405,7 +373,7 @@ dist_noinst_DATA = \
 	$(plugin_in_files) \
 	vinagre.doap
 
-CLEANFILES += \
+CLEANFILES = \
 	$(nodist_desktop_DATA) \
 	$(nodist_mime_DATA) \
 	$(gsettings_SCHEMAS) \
diff --git a/configure.ac b/configure.ac
index e906525..cbf530c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,16 +220,6 @@ AS_IF([test "x$enable_ssh" = "xyes"],
   [ACTIVE_PLUGINS="$ACTIVE_PLUGINS,ssh"])
 AC_SUBST([ACTIVE_PLUGINS])
 
-# Introspection
-GOBJECT_INTROSPECTION_CHECK([0.9.3])
-
-AS_IF([test "x$found_introspection" = "xyes"],
-  [enable_introspection=yes
-    AC_DEFINE([VINAGRE_HAVE_INTROSPECTION], [], [Build with GObject Introspection support])],
-  [enable_introspection=no])
-
-AM_CONDITIONAL([VINAGRE_HAVE_INTROSPECTION], [test "x$enable_introspection" = "xyes"])
-
 GNOME_DOC_INIT
 
 GLIB_GSETTINGS