[libgdata] [build] Update git.mk and .gitignore generation

[Philip Withnall <pwithnall src gnome org>]

commit b96db0bf51ea05fed6ddec5af41d39add634d651
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Dec 29 00:18:36 2009 +0000

    [build] Update git.mk and .gitignore generation
    
    Update our copy of git.mk from Pango and fix up some problems with .gitignore
    generation.

 Makefile.am |    6 +++---
 git.mk      |    5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index add15a5..5083c1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -427,9 +427,6 @@ gcov:
 endif
 
 # Cleaning
-clean-local:
-	rm -f *~ *.bb *.bbg *.da .libs/*.da .libs/*.bbg
-
 EXTRA_DIST += \
 	COPYING.LIB		\
 	autogen.sh		\
@@ -442,6 +439,9 @@ EXTRA_DIST += \
 	gtk-doc.make		\
 	libgdata.doap
 
+CLEANFILES += \
+	`find "$(srcdir)" -type f -name .dirstamp -print`
+
 DISTCLEANFILES = \
 	intltool-extract	\
 	intltool-merge		\
diff --git a/git.mk b/git.mk
index fbd56e0..94105cf 100644
--- a/git.mk
+++ b/git.mk
@@ -115,6 +115,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
 				po/.intltool-merge-cache \
 				"po/*.gmo" \
 				"po/*.mo" \
+				po/$(GETTEXT_PACKAGE).pot \
 				intltool-extract.in \
 				intltool-merge.in \
 				intltool-update.in \
@@ -135,6 +136,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
 			$(GITIGNOREFILES) \
 			$(CLEANFILES) \
 			$(PROGRAMS) \
+			$(check_PROGRAMS) \
 			$(EXTRA_PROGRAMS) \
 			$(LTLIBRARIES) \
 			so_locations \
@@ -161,7 +163,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
 	} | \
 	sed "s ^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
 	sed 's@/[.]/@/@g' | \
-	LANG=C sort | uniq > $  tmp && \
+	LC_ALL=C sort | uniq > $  tmp && \
 	mv $  tmp $@;
 
 all: $(srcdir)/.gitignore gitignore-recurse-maybe
@@ -180,3 +182,4 @@ gitignore-clean:
 	-rm -f $(srcdir)/.gitignore
 
 .PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
+