[at-spi2-atk] Fix various warnings

[Mike Gorse <mgorse src gnome org>]

commit 7d2b7b43773586f20bd7d76d74e96012b6a82fe5
Author: Marc-Andrà Lureau <marcandre lureau gmail com>
Date:   Mon Feb 4 20:31:49 2013 +0100

    Revert "Fix srcdir != builddir build"
    
    This reverts commit 680a9f72a0c3019cf4013ed026270ee7b9f1abc9.
    
    See bug https://bugzilla.gnome.org/show_bug.cgi?id=690972

 Makefile.am |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d241eaf..b44e8d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -141,8 +141,9 @@ Gd_1_0_gir_INCLUDES = $(LIBGD_GIR_INCLUDES)
 Gd_1_0_gir_FILES = $(nodist_libgd_la_SOURCES)
 
 if LIBGD_STATIC
-noinst_DATA += $(builddir)/Gd-1.0.gir
-MAINTAINERCLEANFILES += $(builddir)/Gd-1.0.gir
+noinst_DATA += $(srcdir)/Gd-1.0.gir
+EXTRA_DIST += $(srcdir)/Gd-1.0.gir
+MAINTAINERCLEANFILES += $(srcdir)/Gd-1.0.gir
 else
 girdir= $(pkgdatadir)/gir-1.0
 typelibdir= $(pkglibdir)/girepository-1.0
@@ -157,11 +158,10 @@ endif
 if LIBGD_VAPI
 VAPIS = $(srcdir)/gd-1.0.vapi
 
-$(srcdir)/gd-1.0.vapi: $(builddir)/Gd-1.0.gir
+$(srcdir)/gd-1.0.vapi: $(srcdir)/Gd-1.0.gir
 	$(AM_V_GEN)$(VAPIGEN)			\
 		--library gd-1.0		\
 		--pkg gtk+-3.0			\
-                -d $(srcdir)			\
 		$<
 #This 'touch' is a workaround for vapigen not touching the dest file if
 #its content hasn't changed, which causes the rule to generate the .vapi