[gir-repository] autoconf-2.64 compat: Don't use $(builddir)

[Owen Taylor <otaylor src gnome org>]

commit 158ba96860f71cd19a21e6a72fb52ea10158ee5b
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Sat Aug 15 09:01:21 2009 -0400

    autoconf-2.64 compat: Don't use $(builddir)
    
    $(builddir) is not a standard automake variable. With autoconf < 2.64
    it ends up getting set in every Makefile.in to '.' (because autoconf
    defines it), but that is no longer the case for 2.64.
    
     * We don't need $(builddir) in  'vpath %.gir $(builddir):$(srcdir)' since
       the builddir is always searched before vpath directories.
    
     * Replace inexplicable usage of $(builddir)/$(@F) and $(@F) with
       plain-old $@
    
    http://bugzilla.gnome.org/show_bug.cgi?id=591899

 gir/Makefile.am |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gir/Makefile.am b/gir/Makefile.am
index 28389e2..d836ca5 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -966,7 +966,7 @@ CLEANFILES += $(typelibs_DATA)
 clean-gir:
 	@rm -fr $(BUILT_GIRSOURCES)
 
-vpath %.gir $(builddir):$(srcdir)
+vpath %.gir $(srcdir)
 
 %.xpath: %.gir
 
@@ -974,13 +974,13 @@ vpath %.gir $(builddir):$(srcdir)
 	$(INTROSPECTION_SCANNER) --xpath-assertions=$(srcdir)/$*.xpath $*.gir
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-	$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
+	$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $@
 
 %.typelib.gdb: %.gir
-	libtool --mode=execute gdb --args $(INTROSPECTION_COMPILER) $< -o $(@F)
+	libtool --mode=execute gdb --args $(INTROSPECTION_COMPILER) $< -o $@
 
 %.tgir: %.typelib $(INTROSPECTION_GENERATE) Makefile
-	 $(DEBUG) $(INTROSPECTION_GENERATE) --includedir=$(srcdir) --includedir=. $< -o $(@F)
+	 $(DEBUG) $(INTROSPECTION_GENERATE) --includedir=$(srcdir) --includedir=. $< -o $@
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(TGIRS)