summaryrefslogtreecommitdiff
path: root/ibus
diff options
context:
space:
mode:
authorPeng Huang <shawn.p.huang@gmail.com>2011-03-16 10:01:18 -0400
committerPeng Huang <shawn.p.huang@gmail.com>2011-03-16 10:01:18 -0400
commit14b7d1a071c08c327ab836a2b7bd3e3b2ab7d1af (patch)
treeb2e46376fd281780021b830a1368ef1c72f4f7e8 /ibus
parent596680ba3cfd5aa8e4c2ef4bd5905a25c4c855b0 (diff)
downloadibus-14b7d1a071c08c327ab836a2b7bd3e3b2ab7d1af.tar.gz
Add git.mk from gtk+ project, Use it to update .gitignore
BUG=none TEST=make Review URL: http://codereview.appspot.com/4280050
Diffstat (limited to 'ibus')
-rw-r--r--ibus/.gitignore25
-rw-r--r--ibus/Makefile.am2
-rw-r--r--ibus/interface/Makefile.am2
3 files changed, 28 insertions, 1 deletions
diff --git a/ibus/.gitignore b/ibus/.gitignore
index 56b6ff10..4d9845eb 100644
--- a/ibus/.gitignore
+++ b/ibus/.gitignore
@@ -1 +1,24 @@
-_config.py
+/*.bak
+/*.lo
+/*.o
+/*.orig
+/*.pyc
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.gitignore
+/.libs
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_config.py
+/_libs
+/so_locations
+/tags
diff --git a/ibus/Makefile.am b/ibus/Makefile.am
index d1cd750d..c71df1b7 100644
--- a/ibus/Makefile.am
+++ b/ibus/Makefile.am
@@ -69,3 +69,5 @@ CLEANFILES = \
DISTCLEANFILES = \
_config.py \
$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/ibus/interface/Makefile.am b/ibus/interface/Makefile.am
index 49871ed2..2d9ae422 100644
--- a/ibus/interface/Makefile.am
+++ b/ibus/interface/Makefile.am
@@ -37,3 +37,5 @@ CLEANFILES = \
*.pyc \
$(NULL)
+
+-include $(top_srcdir)/git.mk