diff options
| author | Milan Crha <mcrha@redhat.com> | 2012-06-07 14:16:54 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2012-06-07 14:16:54 +0800 |
| commit | 8ee87f53ef1d849c8cea700ae0aa048c805c55ef (patch) | |
| tree | 8da074e43113e0c71c1e27b3c281db44ff2c55a9 /capplet | |
| parent | d146d85899bf9e546961f8a9bdcc8cd7aec0de9b (diff) | |
| download | gsoc2013-evolution-8ee87f53ef1d849c8cea700ae0aa048c805c55ef.tar gsoc2013-evolution-8ee87f53ef1d849c8cea700ae0aa048c805c55ef.tar.gz gsoc2013-evolution-8ee87f53ef1d849c8cea700ae0aa048c805c55ef.tar.bz2 gsoc2013-evolution-8ee87f53ef1d849c8cea700ae0aa048c805c55ef.tar.lz gsoc2013-evolution-8ee87f53ef1d849c8cea700ae0aa048c805c55ef.tar.xz gsoc2013-evolution-8ee87f53ef1d849c8cea700ae0aa048c805c55ef.tar.zst gsoc2013-evolution-8ee87f53ef1d849c8cea700ae0aa048c805c55ef.zip | |
Add missing '-include $(top_srcdir)/git.mk'
Diffstat (limited to 'capplet')
| -rw-r--r-- | capplet/.gitignore | 33 | ||||
| -rw-r--r-- | capplet/Makefile.am | 1 |
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 |