Add git.mk from gtk+ project, Use it to update .gitignore

BUG=none
TEST=make

Review URL: http://codereview.appspot.com/4280050

5 files changed, 31 insertions, 1 deletions

diff --git a/client/Makefile.am b/client/Makefile.am
index fa3cee6c..53561024 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -37,3 +37,5 @@ SUBDIRS = \
 	$(GTK3) \
 	$(X11) \
 	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/client/gtk2/Makefile.am b/client/gtk2/Makefile.am
index 730cdbe3..471a11c6 100644
--- a/client/gtk2/Makefile.am
+++ b/client/gtk2/Makefile.am
@@ -62,3 +62,5 @@ EXTRA_DIST = \
 
 test: all
 	GTK_IM_MODULE=ibus gedit
+
+-include $(top_srcdir)/git.mk
diff --git a/client/gtk3/Makefile.am b/client/gtk3/Makefile.am
index 9f297aab..45056224 100644
--- a/client/gtk3/Makefile.am
+++ b/client/gtk3/Makefile.am
@@ -62,3 +62,5 @@ EXTRA_DIST = \
 
 test: all
 	GTK_IM_MODULE=ibus gedit
+
+-include $(top_srcdir)/git.mk
diff --git a/client/x11/.gitignore b/client/x11/.gitignore
index bdff9a1f..d92e9429 100644
--- a/client/x11/.gitignore
+++ b/client/x11/.gitignore
@@ -1 +1,23 @@
-ibus-x11
+/*.bak
+/*.lo
+/*.o
+/*.orig
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.gitignore
+/.libs
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_libs
+/ibus-x11
+/so_locations
+/tags
diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index 5b398b37..91d97ddc 100644
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -70,3 +70,5 @@ locales.h:
 		uniq | sort | \
 		xargs python -c 'import sys;print "#define LOCALES_STRING \"%s\"" % ",".join(sys.argv[1:])' \
 	 ) > $@
+
+-include $(top_srcdir)/git.mk