aboutsummaryrefslogtreecommitdiffstats
path: root/capplet
diff options
context:
space:
mode:
Diffstat (limited to 'capplet')
-rw-r--r--capplet/.gitignore33
-rw-r--r--capplet/Makefile.am1
2 files changed, 25 insertions, 9 deletions
diff --git a/capplet/.gitignore b/capplet/.gitignore
index 91aad6ac7d..d0925c275f 100644
--- a/capplet/.gitignore
+++ b/capplet/.gitignore
@@ -1,9 +1,24 @@
-.deps
-.libs
-*.o
-*.lo
-*~
-Makefile.in
-Makefile
-evolution-settings
-libevolution-mail-settings.la
+/*.bak
+/*.lo
+/*.o
+/*.orig
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.dirstamp
+/.gitignore
+/.libs
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_libs
+/evolution-settings
+/so_locations
+/tags
diff --git a/capplet/Makefile.am b/capplet/Makefile.am
index 4270ff26b1..c339a63853 100644
--- a/capplet/Makefile.am
+++ b/capplet/Makefile.am
@@ -64,3 +64,4 @@ evolution_settings_LDADD = \
$(top_builddir)/em-format/libemformat.la \
$(top_builddir)/libemail-utils/libemail-utils.la
+-include $(top_srcdir)/git.mk