[vinagre] Use subdir-objects and fix parallel make

[David King <davidk src gnome org>]

commit 8d023ecb5e65b107ccbdffa27a42800974584d47
Author: David King <amigadave amigadave com>
Date:   Wed Mar 9 18:26:05 2011 +0100

    Use subdir-objects and fix parallel make
    
    Call AM_INIT with the 'subdir-objects' option. Additionally, make the
    gir file generated by GObject Introspection depend on the convenience
    library, so that a parallel make succeeds.

 Makefile.am  |    4 ++--
 configure.ac |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 01cd302..64f17be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -277,9 +277,9 @@ if VINAGRE_HAVE_INTROSPECTION
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS = Vinagre-3.0.gir
 
-Vinagre-3.0.gir: vinagre
+Vinagre-3.0.gir: libvinagre.la
 INTROSPECTION_SCANNER_ARGS = $(AM_CPPFLAGS) $(VINAGRE_CFLAGS) -I$(top_srcdir) --warn-all
-Vinagre_3_0_gir_LIBS = $(builddir)/libvinagre.la
+Vinagre_3_0_gir_LIBS = libvinagre.la
 Vinagre_3_0_gir_FILES = $(vinagreh_HEADERS) $(filter-out pty_open.h vinagre-plugin-dialog.h, $(noinst_vinagreh_headers)) $(handwritten_sources)
 Vinagre_3_0_gir_INCLUDES = $(INTROSPECTION_GIR_INCLUDES)
 
diff --git a/configure.ac b/configure.ac
index cf46345..ff574d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR([vinagre/vinagre-main.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.10 -Wall check-news no-define nostdinc])
+AM_INIT_AUTOMAKE([1.10 -Wall check-news no-define nostdinc subdir-objects])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 # Checks for programs.