[libgdata] Updated ChangeLog code and .gitignore macro file

[Philip Withnall <pwithnall src gnome org>]

commit f19d93c7ff15cfeccc7ea089b327945cd89fba4b
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Apr 19 00:22:56 2009 +0100

    Updated ChangeLog code and .gitignore macro file
    
    Updated ChangeLog Automake code from http://live.gnome.org/Git/ChangeLog,
    and .gitignore macro file from Pango master.
---
 Makefile.am |    9 ++++++---
 git.mk      |   14 +++++++++-----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index da0f0e4..3ac49a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,10 +45,12 @@ pkgconfig_DATA = libgdata.pc
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
 # ChangeLog
-ChangeLog:
+ChangeLog: $(srcdir)/ChangeLog
+$(srcdir)/ChangeLog:
 	@echo Creating $@
 	@if test -d "$(srcdir)/.git"; then \
-	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat) | fmt --split-only > $  tmp \
+	  (GIT_DIR=$(top_srcdir)/.git ./missing --run \
+	   git log --stat) | fmt --split-only > $  tmp \
 	  && mv -f $  tmp $@ \
 	  || ($(RM) $  tmp; \
 	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
@@ -58,6 +60,7 @@ ChangeLog:
 	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
 	  echo A git checkout and git-log is required to generate this file >> $@); \
 	fi
-.PHONY: ChangeLog
+.PHONY: $(srcdir)/ChangeLog
+
 
 -include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
index 3809d71..9cfce1c 100644
--- a/git.mk
+++ b/git.mk
@@ -1,8 +1,12 @@
 # git.mk
 #
-# Copyright 2009 Red Hat, Inc.
+# Copyright 2009, Red Hat, Inc.
 # Written by Behdad Esfahbod
 #
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+#
 # The canonical source for this file is pango/git.mk, or whereever the
 # header of pango/git.mk suggests in the future.
 #
@@ -77,7 +81,7 @@ git-mk-install:
 
 ### .gitignore generation
 
-.gitignore: Makefile.am $(top_srcdir)/git.mk
+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
 	@echo Generating $@; \
 	GTKDOCGITIGNOREFILES=; \
 	test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x || \
@@ -155,12 +159,12 @@ git-mk-install:
 		"*~" \
 		".*.swp" \
 	; do echo /$$x; done | \
-	grep -v '/[.][.]/' | \
+	sed "s ^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
 	sed 's@/[.]/@/@g' | \
 	LANG=C sort | uniq > $  tmp && \
 	mv $  tmp $@;
 
-all: .gitignore gitignore-recurse
+all: $(srcdir)/.gitignore gitignore-recurse
 gitignore-recurse:
 	@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
 		list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
@@ -169,6 +173,6 @@ gitignore-recurse:
 	fi;
 maintainer-clean-local: gitignore-clean
 gitignore-clean:
-	rm -f .gitignore
+	rm -f $(srcdir)/.gitignore
 .PHONY: gitignore-clean gitignore-recurse