From 20edd1bc425fcb9126720574e202eb33566da3e5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 17 Nov 2009 20:20:07 -0500 Subject: [PATCH] Enable automatic .gitignore generation. Uses Behdad Esfahbod's excellent git.mk script. Also fix some untracked files that the script found. --- .gitignore | 186 +++++++++++++++++---- Makefile.am | 30 +++- addressbook/Makefile.am | 2 + addressbook/backends/Makefile.am | 2 + addressbook/backends/file/Makefile.am | 2 + addressbook/backends/google/Makefile.am | 2 + addressbook/backends/groupwise/Makefile.am | 2 + addressbook/backends/ldap/Makefile.am | 2 + addressbook/backends/vcf/Makefile.am | 2 + addressbook/backends/webdav/Makefile.am | 2 + addressbook/libebook/Makefile.am | 2 + addressbook/libedata-book/Makefile.am | 2 + addressbook/tests/Makefile.am | 2 + addressbook/tests/ebook/Makefile.am | 2 + addressbook/tests/vcard/Makefile.am | 2 + art/Makefile.am | 2 + calendar/Makefile.am | 2 + calendar/backends/Makefile.am | 2 + calendar/backends/caldav/Makefile.am | 2 + calendar/backends/contacts/Makefile.am | 2 + calendar/backends/file/Makefile.am | 2 + calendar/backends/google/Makefile.am | 2 + calendar/backends/groupwise/Makefile.am | 2 + calendar/backends/http/Makefile.am | 2 + calendar/backends/weather/Makefile.am | 2 + calendar/libecal/Makefile.am | 2 + calendar/libedata-cal/Makefile.am | 2 + calendar/tests/Makefile.am | 3 +- calendar/tests/ecal/Makefile.am | 2 + camel/Makefile.am | 2 + camel/providers/Makefile.am | 2 + camel/providers/groupwise/Makefile.am | 2 + camel/providers/hula/Makefile.am | 2 + camel/providers/imap/Makefile.am | 2 + camel/providers/imap4/Makefile.am | 2 + camel/providers/imapx/Makefile.am | 2 + camel/providers/local/Makefile.am | 2 + camel/providers/nntp/Makefile.am | 2 + camel/providers/pop3/Makefile.am | 2 + camel/providers/sendmail/Makefile.am | 2 + camel/providers/smtp/Makefile.am | 2 + camel/tests/Makefile.am | 2 + camel/tests/folder/Makefile.am | 2 + camel/tests/lib/Makefile.am | 2 + camel/tests/message/Makefile.am | 2 + camel/tests/mime-filter/Makefile.am | 2 + camel/tests/misc/Makefile.am | 2 + camel/tests/smime/Makefile.am | 2 + camel/tests/stream/Makefile.am | 2 + docs/Makefile.am | 3 +- docs/reference/.gitignore | 37 ++-- docs/reference/Makefile.am | 2 + docs/reference/addressbook/Makefile.am | 2 + docs/reference/addressbook/libebook/Makefile.am | 2 + .../addressbook/libedata-book/Makefile.am | 2 + docs/reference/calendar/Makefile.am | 2 + docs/reference/calendar/libecal/Makefile.am | 2 + docs/reference/calendar/libedata-cal/Makefile.am | 2 + docs/reference/camel/Makefile.am | 2 + docs/reference/camel/camel-overrides.txt | 0 docs/reference/libebackend/Makefile.am | 2 + docs/reference/libedataserver/Makefile.am | 2 + docs/reference/libedataserverui/Makefile.am | 2 + git.mk | 178 ++++++++++++++++++++ libebackend/Makefile.am | 2 + libedataserver/Makefile.am | 2 + libedataserverui/Makefile.am | 5 + servers/Makefile.am | 2 + servers/google/Makefile.am | 2 + servers/google/libgdata-google/Makefile.am | 2 + servers/google/libgdata/Makefile.am | 2 + servers/groupwise/Makefile.am | 2 + win32/Makefile.am | 2 + 73 files changed, 514 insertions(+), 58 deletions(-) create mode 100644 docs/reference/camel/camel-overrides.txt create mode 100644 git.mk diff --git a/.gitignore b/.gitignore index cfc2cfd..178bc53 100644 --- a/.gitignore +++ b/.gitignore @@ -1,37 +1,149 @@ -# for all subdirectories -Makefile.in -Makefile -.libs -.deps -*.o -*.lo -*.la -.*.swp - -# autofoo stuff here -aclocal.m4 -autom4te.cache -compile -config.* -configure -depcomp -gtk-doc.make -install-sh -intltool-*.in -libtool -ltmain.sh -missing -mkinstalldirs -stamp-* -INSTALL -dolt* - -# misc generated stuff -*.pc -*.server -*-bindings.h -*-glue.h -*-marshal.[ch] -*-enumtypes.[ch] -iconv-detect.h -*.service +/*.bak +/*.lo +/*.o +/*.orig +/*.rej +/*.tab.c +/*~ +/.*.sw[nop] +/.deps +/.gitignore +/.libs +/GPATH +/GRTAGS +/GSYMS +/GTAGS +/ID +/INSTALL +/Makefile +/Makefile.in +/TAGS +/_libs +/aclocal.m4 +/autom4te.cache +/autoscan.log +/compile +/config.cache +/config.guess +/config.h +/config.h.in +/config.log +/config.lt +/config.status +/config.status.lineno +/config.sub +/configure +/configure.lineno +/configure.scan +/depcomp +/evolution-data-server-1.2.pc +/evolution-data-server-zip +/evolution-data-server.pc +/gtk-doc.make +/iconv-detect.h +/install-sh +/intltool-extract.in +/intltool-merge.in +/intltool-update.in +/libtool +/ltmain.sh +/m4/gtk-doc.m4 +/m4/intltool.m4 +/m4/libtool.m4 +/m4/ltoptions.m4 +/m4/ltsugar.m4 +/m4/ltversion.m4 +/m4/lt~obsolete.m4 +/missing +/mkinstalldirs +/po/*.mo +/po/.intltool-merge-cache +/po/Makefile +/po/Makefile.in +/po/Makefile.in.in +/po/POTFILES +/po/am.gmo +/po/ar.gmo +/po/as.gmo +/po/ast.gmo +/po/az.gmo +/po/be.gmo +/po/bg.gmo +/po/bn.gmo +/po/bn_IN.gmo +/po/bs.gmo +/po/ca.gmo +/po/cs.gmo +/po/cy.gmo +/po/da.gmo +/po/de.gmo +/po/dz.gmo +/po/el.gmo +/po/en@shaw.gmo +/po/en_AU.gmo +/po/en_CA.gmo +/po/en_GB.gmo +/po/es.gmo +/po/et.gmo +/po/eu.gmo +/po/fa.gmo +/po/fi.gmo +/po/fr.gmo +/po/ga.gmo +/po/gl.gmo +/po/gu.gmo +/po/he.gmo +/po/hi.gmo +/po/hr.gmo +/po/hu.gmo +/po/id.gmo +/po/is.gmo +/po/it.gmo +/po/ja.gmo +/po/ka.gmo +/po/kn.gmo +/po/ko.gmo +/po/ku.gmo +/po/lt.gmo +/po/lv.gmo +/po/mai.gmo +/po/mk.gmo +/po/ml.gmo +/po/mn.gmo +/po/mr.gmo +/po/ms.gmo +/po/nb.gmo +/po/ne.gmo +/po/nl.gmo +/po/nn.gmo +/po/oc.gmo +/po/or.gmo +/po/pa.gmo +/po/pl.gmo +/po/pt.gmo +/po/pt_BR.gmo +/po/ro.gmo +/po/ru.gmo +/po/rw.gmo +/po/si.gmo +/po/sk.gmo +/po/sl.gmo +/po/sq.gmo +/po/sr.gmo +/po/sr@latin.gmo +/po/stamp-it +/po/sv.gmo +/po/ta.gmo +/po/te.gmo +/po/th.gmo +/po/tr.gmo +/po/uk.gmo +/po/vi.gmo +/po/wa.gmo +/po/xh.gmo +/po/zh_CN.gmo +/po/zh_HK.gmo +/po/zh_TW.gmo +/so_locations +/stamp-h1 +/tags diff --git a/Makefile.am b/Makefile.am index dcbdbbf..5d06719 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,10 +34,32 @@ EXTRA_DIST = \ evolution-data-server-zip.in \ $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update \ +DISTCLEANFILES = \ iconv-detect.h \ $(pkgconfig_DATA) +MAINTAINERCLEANFILES = \ + $(srcdir)/INSTALL \ + $(srcdir)/aclocal.m4 \ + $(srcdir)/autoscan.log \ + $(srcdir)/compile \ + $(srcdir)/config.guess \ + $(srcdir)/config.h.in \ + $(srcdir)/config.sub \ + $(srcdir)/configure.scan \ + $(srcdir)/depcomp \ + $(srcdir)/install-sh \ + $(srcdir)/ltmain.sh \ + $(srcdir)/missing \ + $(srcdir)/mkinstalldirs \ + $(srcdir)/gtk-doc.make \ + $(srcdir)/m4/gtk-doc.m4 \ + $(srcdir)/m4/intltool.m4 \ + $(srcdir)/m4/libtool.m4 \ + $(srcdir)/m4/ltoptions.m4 \ + $(srcdir)/m4/ltsugar.m4 \ + $(srcdir)/m4/ltversion.m4 \ + $(srcdir)/m4/lt~obsolete.m4 + + +-include $(top_srcdir)/git.mk diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am index 4bb2127..0c226fe 100644 --- a/addressbook/Makefile.am +++ b/addressbook/Makefile.am @@ -1 +1,3 @@ SUBDIRS = libebook libedata-book backends tests + +-include $(top_srcdir)/git.mk diff --git a/addressbook/backends/Makefile.am b/addressbook/backends/Makefile.am index 9265bf3..b172d1c 100644 --- a/addressbook/backends/Makefile.am +++ b/addressbook/backends/Makefile.am @@ -5,3 +5,5 @@ LDAP_SUBDIR = endif SUBDIRS = file vcf $(LDAP_SUBDIR) google groupwise webdav + +-include $(top_srcdir)/git.mk diff --git a/addressbook/backends/file/Makefile.am b/addressbook/backends/file/Makefile.am index 4f8ae71..7e1eea0 100644 --- a/addressbook/backends/file/Makefile.am +++ b/addressbook/backends/file/Makefile.am @@ -24,3 +24,5 @@ libebookbackendfile_la_LIBADD = \ $(EVOLUTION_ADDRESSBOOK_LIBS) libebookbackendfile_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + +-include $(top_srcdir)/git.mk diff --git a/addressbook/backends/google/Makefile.am b/addressbook/backends/google/Makefile.am index c593b99..b70c976 100644 --- a/addressbook/backends/google/Makefile.am +++ b/addressbook/backends/google/Makefile.am @@ -36,3 +36,5 @@ libebookbackendgoogle_la_LIBADD = \ libebookbackendgoogle_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) + +-include $(top_srcdir)/git.mk diff --git a/addressbook/backends/groupwise/Makefile.am b/addressbook/backends/groupwise/Makefile.am index 530c8d4..12bd8d7 100644 --- a/addressbook/backends/groupwise/Makefile.am +++ b/addressbook/backends/groupwise/Makefile.am @@ -48,3 +48,5 @@ create_account_LDADD = $(top_builddir)/addressbook/libedata-book/libedata-book- $(top_builddir)/servers/groupwise/libegroupwise-1.2.la \ $(E_DATA_SERVER_LIBS) + +-include $(top_srcdir)/git.mk diff --git a/addressbook/backends/ldap/Makefile.am b/addressbook/backends/ldap/Makefile.am index c070f8f..48eea41 100644 --- a/addressbook/backends/ldap/Makefile.am +++ b/addressbook/backends/ldap/Makefile.am @@ -32,3 +32,5 @@ ldapschemadir = $(privdatadir) ldapschema_DATA= $(LDAP_SCHEMA) EXTRA_DIST = $(LDAP_SCHEMA) openldap-extract.h + +-include $(top_srcdir)/git.mk diff --git a/addressbook/backends/vcf/Makefile.am b/addressbook/backends/vcf/Makefile.am index cbd59df..9ac71e7 100644 --- a/addressbook/backends/vcf/Makefile.am +++ b/addressbook/backends/vcf/Makefile.am @@ -23,3 +23,5 @@ libebookbackendvcf_la_LIBADD = \ libebookbackendvcf_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) + +-include $(top_srcdir)/git.mk diff --git a/addressbook/backends/webdav/Makefile.am b/addressbook/backends/webdav/Makefile.am index ece0bd2..4162b65 100644 --- a/addressbook/backends/webdav/Makefile.am +++ b/addressbook/backends/webdav/Makefile.am @@ -23,3 +23,5 @@ libebookbackendwebdav_la_LIBADD = \ $(EVOLUTION_ADDRESSBOOK_LIBS) libebookbackendwebdav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) + +-include $(top_srcdir)/git.mk diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am index bb77edc..2210723 100644 --- a/addressbook/libebook/Makefile.am +++ b/addressbook/libebook/Makefile.am @@ -77,3 +77,5 @@ EXTRA_DIST = \ dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/addressbook/libedata-book/Makefile.am b/addressbook/libedata-book/Makefile.am index 187ec5d..b11b0e2 100644 --- a/addressbook/libedata-book/Makefile.am +++ b/addressbook/libedata-book/Makefile.am @@ -103,3 +103,5 @@ EXTRA_DIST = \ e-data-book.xml \ $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) \ $(service_in_files) + +-include $(top_srcdir)/git.mk diff --git a/addressbook/tests/Makefile.am b/addressbook/tests/Makefile.am index cae2855..591bdff 100644 --- a/addressbook/tests/Makefile.am +++ b/addressbook/tests/Makefile.am @@ -1 +1,3 @@ SUBDIRS = vcard ebook + +-include $(top_srcdir)/git.mk diff --git a/addressbook/tests/ebook/Makefile.am b/addressbook/tests/ebook/Makefile.am index 56b97c6..ff6dcce 100644 --- a/addressbook/tests/ebook/Makefile.am +++ b/addressbook/tests/ebook/Makefile.am @@ -42,3 +42,5 @@ test_untyped_phones_LDADD=$(TEST_LIBS) test_untyped_phones_CPPFLAGS=$(TEST_CPPFLAGS) test_stress_bookviews_LDADD=$(TEST_LIBS) test_stress_bookviews_CPPFLAGS=$(TEST_CPPFLAGS) + +-include $(top_srcdir)/git.mk diff --git a/addressbook/tests/vcard/Makefile.am b/addressbook/tests/vcard/Makefile.am index 5a274ca..a89f0ff 100644 --- a/addressbook/tests/vcard/Makefile.am +++ b/addressbook/tests/vcard/Makefile.am @@ -12,3 +12,5 @@ dump_vcard_LDADD = \ $(EVOLUTION_ADDRESSBOOK_LIBS) EXTRA_DIST=1.vcf 2.vcf 3.vcf 4.vcf 5.vcf 6.vcf 7.vcf 8.vcf 9.vcf 10.vcf 11.vcf + +-include $(top_srcdir)/git.mk diff --git a/art/Makefile.am b/art/Makefile.am index 4bc6dac..fed6667 100644 --- a/art/Makefile.am +++ b/art/Makefile.am @@ -20,3 +20,5 @@ images_DATA = \ EXTRA_DIST = \ $(images_DATA) + +-include $(top_srcdir)/git.mk diff --git a/calendar/Makefile.am b/calendar/Makefile.am index 53770ca..1213b79 100644 --- a/calendar/Makefile.am +++ b/calendar/Makefile.am @@ -1 +1,3 @@ SUBDIRS = libecal libedata-cal backends tests + +-include $(top_srcdir)/git.mk diff --git a/calendar/backends/Makefile.am b/calendar/backends/Makefile.am index 34bcd96..1f6b288 100644 --- a/calendar/backends/Makefile.am +++ b/calendar/backends/Makefile.am @@ -5,3 +5,5 @@ WEATHER_SUBDIR = endif SUBDIRS = file groupwise http contacts $(WEATHER_SUBDIR) caldav google + +-include $(top_srcdir)/git.mk diff --git a/calendar/backends/caldav/Makefile.am b/calendar/backends/caldav/Makefile.am index 45dde7d..d052945 100644 --- a/calendar/backends/caldav/Makefile.am +++ b/calendar/backends/caldav/Makefile.am @@ -25,3 +25,5 @@ libecalbackendcaldav_la_LIBADD = \ libecalbackendcaldav_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) + +-include $(top_srcdir)/git.mk diff --git a/calendar/backends/contacts/Makefile.am b/calendar/backends/contacts/Makefile.am index 8a48934..c38a7b9 100644 --- a/calendar/backends/contacts/Makefile.am +++ b/calendar/backends/contacts/Makefile.am @@ -26,3 +26,5 @@ libecalbackendcontacts_la_LIBADD = \ libecalbackendcontacts_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) + +-include $(top_srcdir)/git.mk diff --git a/calendar/backends/file/Makefile.am b/calendar/backends/file/Makefile.am index 5adebcb..c58c6a3 100644 --- a/calendar/backends/file/Makefile.am +++ b/calendar/backends/file/Makefile.am @@ -29,3 +29,5 @@ libecalbackendfile_la_LIBADD = \ libecalbackendfile_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) + +-include $(top_srcdir)/git.mk diff --git a/calendar/backends/google/Makefile.am b/calendar/backends/google/Makefile.am index f7959ad..9cc1706 100644 --- a/calendar/backends/google/Makefile.am +++ b/calendar/backends/google/Makefile.am @@ -35,3 +35,5 @@ libecalbackendgoogle_la_LIBADD = \ libecalbackendgoogle_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) + +-include $(top_srcdir)/git.mk diff --git a/calendar/backends/groupwise/Makefile.am b/calendar/backends/groupwise/Makefile.am index 3a8c654..424113e 100644 --- a/calendar/backends/groupwise/Makefile.am +++ b/calendar/backends/groupwise/Makefile.am @@ -32,3 +32,5 @@ libecalbackendgroupwise_la_LIBADD = \ libecalbackendgroupwise_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) + +-include $(top_srcdir)/git.mk diff --git a/calendar/backends/http/Makefile.am b/calendar/backends/http/Makefile.am index 603eb94f..fd0c97c 100644 --- a/calendar/backends/http/Makefile.am +++ b/calendar/backends/http/Makefile.am @@ -26,3 +26,5 @@ libecalbackendhttp_la_LIBADD = \ libecalbackendhttp_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) + +-include $(top_srcdir)/git.mk diff --git a/calendar/backends/weather/Makefile.am b/calendar/backends/weather/Makefile.am index fe3e001..6a6fec9 100644 --- a/calendar/backends/weather/Makefile.am +++ b/calendar/backends/weather/Makefile.am @@ -47,3 +47,5 @@ weatherdata_DATA = $(weatherdata_in_files:.xml.in=.xml) DISTCLEANFILES = Locations.xml EXTRA_DIST = Locations.xml.in + +-include $(top_srcdir)/git.mk diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am index 1b1fa2a..45daa94 100644 --- a/calendar/libecal/Makefile.am +++ b/calendar/libecal/Makefile.am @@ -71,3 +71,5 @@ EXTRA_DIST = \ dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am index 12d623d..d9ba08d 100644 --- a/calendar/libedata-cal/Makefile.am +++ b/calendar/libedata-cal/Makefile.am @@ -112,3 +112,5 @@ e_calendar_factory_CPPFLAGS = \ e_calendar_factory_LDADD = \ $(builddir)/libedata-cal-1.2.la \ $(top_builddir)/libebackend/libebackend-1.2.la + +-include $(top_srcdir)/git.mk diff --git a/calendar/tests/Makefile.am b/calendar/tests/Makefile.am index 83d04c0..0962d08 100644 --- a/calendar/tests/Makefile.am +++ b/calendar/tests/Makefile.am @@ -1 +1,2 @@ -SUBDIRS = ecal \ No newline at end of file +SUBDIRS = ecal +-include $(top_srcdir)/git.mk diff --git a/calendar/tests/ecal/Makefile.am b/calendar/tests/ecal/Makefile.am index 0cd6ac0..af5f5b8 100644 --- a/calendar/tests/ecal/Makefile.am +++ b/calendar/tests/ecal/Makefile.am @@ -48,3 +48,5 @@ test_search_LDADD = \ $(top_builddir)/calendar/libecal/libecal-1.2.la \ $(LIBICAL_LIBS) \ $(EVOLUTION_CALENDAR_LIBS) + +-include $(top_srcdir)/git.mk diff --git a/camel/Makefile.am b/camel/Makefile.am index e696bed..9df7b95 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -407,3 +407,5 @@ EXTRA_DIST = \ CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = $(pkgconfig_DATA) + +-include $(top_srcdir)/git.mk diff --git a/camel/providers/Makefile.am b/camel/providers/Makefile.am index 6472be1..0bd583b 100644 --- a/camel/providers/Makefile.am +++ b/camel/providers/Makefile.am @@ -22,3 +22,5 @@ endif SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAPX_DIR) $(IMAP4_DIR) $(NNTP_DIR) local groupwise $(HULA_DIR) + +-include $(top_srcdir)/git.mk diff --git a/camel/providers/groupwise/Makefile.am b/camel/providers/groupwise/Makefile.am index 11b06eb..55b478d 100644 --- a/camel/providers/groupwise/Makefile.am +++ b/camel/providers/groupwise/Makefile.am @@ -47,3 +47,5 @@ libcamelgroupwise_la_LIBADD = \ $(E_DATA_SERVER_LIBS) EXTRA_DIST = libcamelgroupwise.urls + +-include $(top_srcdir)/git.mk diff --git a/camel/providers/hula/Makefile.am b/camel/providers/hula/Makefile.am index 56e27e3..6bd5b23 100644 --- a/camel/providers/hula/Makefile.am +++ b/camel/providers/hula/Makefile.am @@ -23,3 +23,5 @@ libcamelhula_la_LIBADD = \ $(CAMEL_LIBS) EXTRA_DIST = libcamelhula.urls + +-include $(top_srcdir)/git.mk diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am index d514b4c..103471f 100644 --- a/camel/providers/imap/Makefile.am +++ b/camel/providers/imap/Makefile.am @@ -48,3 +48,5 @@ libcamelimap_la_LIBADD = \ $(CAMEL_LIBS) EXTRA_DIST = libcamelimap.urls + +-include $(top_srcdir)/git.mk diff --git a/camel/providers/imap4/Makefile.am b/camel/providers/imap4/Makefile.am index 47d5ad9..7b85498 100644 --- a/camel/providers/imap4/Makefile.am +++ b/camel/providers/imap4/Makefile.am @@ -45,3 +45,5 @@ libcamelimap4_la_LIBADD = \ $(CAMEL_LIBS) EXTRA_DIST = libcamelimap4.urls + +-include $(top_srcdir)/git.mk diff --git a/camel/providers/imapx/Makefile.am b/camel/providers/imapx/Makefile.am index 9b7d4bd..d323494 100644 --- a/camel/providers/imapx/Makefile.am +++ b/camel/providers/imapx/Makefile.am @@ -57,3 +57,5 @@ test_imapx_LDADD = \ libcamelimapx.la EXTRA_DIST = libcamelimapx.urls + +-include $(top_srcdir)/git.mk diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am index c046901..3f7bc7a 100644 --- a/camel/providers/local/Makefile.am +++ b/camel/providers/local/Makefile.am @@ -61,3 +61,5 @@ libcamellocal_la_LIBADD = \ $(CAMEL_LIBS) EXTRA_DIST = libcamellocal.urls + +-include $(top_srcdir)/git.mk diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am index 8a0125b..913bb8a 100644 --- a/camel/providers/nntp/Makefile.am +++ b/camel/providers/nntp/Makefile.am @@ -38,3 +38,5 @@ libcamelnntp_la_LIBADD = \ $(CAMEL_LIBS) EXTRA_DIST = libcamelnntp.urls + +-include $(top_srcdir)/git.mk diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am index 82390b3..356428b 100644 --- a/camel/providers/pop3/Makefile.am +++ b/camel/providers/pop3/Makefile.am @@ -30,3 +30,5 @@ libcamelpop3_la_LIBADD = \ $(CAMEL_LIBS) EXTRA_DIST = libcamelpop3.urls + +-include $(top_srcdir)/git.mk diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am index d99217f..6e78be1 100644 --- a/camel/providers/sendmail/Makefile.am +++ b/camel/providers/sendmail/Makefile.am @@ -27,3 +27,5 @@ libcamelsendmail_la_LIBADD = \ $(CAMEL_LIBS) EXTRA_DIST = libcamelsendmail.urls + +-include $(top_srcdir)/git.mk diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am index a01eaf0..e5cc3c8 100644 --- a/camel/providers/smtp/Makefile.am +++ b/camel/providers/smtp/Makefile.am @@ -24,3 +24,5 @@ libcamelsmtp_la_LIBADD = \ $(CAMEL_LIBS) EXTRA_DIST = libcamelsmtp.urls + +-include $(top_srcdir)/git.mk diff --git a/camel/tests/Makefile.am b/camel/tests/Makefile.am index a25c7a5..924a658 100644 --- a/camel/tests/Makefile.am +++ b/camel/tests/Makefile.am @@ -5,3 +5,5 @@ EXTRA_DIST = data dist-hook: rm -rf `find $(distdir)/data -name .svn` + +-include $(top_srcdir)/git.mk diff --git a/camel/tests/folder/Makefile.am b/camel/tests/folder/Makefile.am index c7b2fb3..be29fc1 100644 --- a/camel/tests/folder/Makefile.am +++ b/camel/tests/folder/Makefile.am @@ -44,3 +44,5 @@ test8_LDADD = $(FOLDER_TESTS_LDADD) test9_LDADD = $(FOLDER_TESTS_LDADD) test10_LDADD = $(FOLDER_TESTS_LDADD) test11_LDADD = $(FOLDER_TESTS_LDADD) + +-include $(top_srcdir)/git.mk diff --git a/camel/tests/lib/Makefile.am b/camel/tests/lib/Makefile.am index f7910a9..fc8624f 100644 --- a/camel/tests/lib/Makefile.am +++ b/camel/tests/lib/Makefile.am @@ -36,3 +36,5 @@ libcameltest_provider_a_LIBADD = \ $(top_builddir)/camel/libcamel-provider-${API_VERSION}.la \ $(top_builddir)/camel/libcamel-${API_VERSION}.la \ $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la + +-include $(top_srcdir)/git.mk diff --git a/camel/tests/message/Makefile.am b/camel/tests/message/Makefile.am index 2f7022a..129e3fc 100644 --- a/camel/tests/message/Makefile.am +++ b/camel/tests/message/Makefile.am @@ -30,3 +30,5 @@ test3_LDADD = $(MESSAGE_TESTS_LDADD) test4_LDADD = $(MESSAGE_TESTS_LDADD) CLEANFILES = test3.msg test3-2.msg test3-3.msg + +-include $(top_srcdir)/git.mk diff --git a/camel/tests/mime-filter/Makefile.am b/camel/tests/mime-filter/Makefile.am index 9915543..028b7da 100644 --- a/camel/tests/mime-filter/Makefile.am +++ b/camel/tests/mime-filter/Makefile.am @@ -36,3 +36,5 @@ test_charset_CPPFLAGS = $(MIMEFILTER_TESTS_CPPFLAGS) test_charset_LDFLAGS = $(MIMEFILTER_TESTS_LDADD) test_tohtml_CPPFLAGS = $(MIMEFILTER_TESTS_CPPFLAGS) test_tohtml_LDFLAGS = $(MIMEFILTER_TESTS_LDADD) + +-include $(top_srcdir)/git.mk diff --git a/camel/tests/misc/Makefile.am b/camel/tests/misc/Makefile.am index 35b8ada..d55972d 100644 --- a/camel/tests/misc/Makefile.am +++ b/camel/tests/misc/Makefile.am @@ -37,3 +37,5 @@ split_CPPFLAGS = $(MISC_TESTS_CPPFLAGS) split_LDADD = $(MISC_TESTS_LDADD) rfc2047_CPPFLAGS = $(MISC_TESTS_CPPFLAGS) rfc2047_LDADD = $(MISC_TESTS_LDADD) + +-include $(top_srcdir)/git.mk diff --git a/camel/tests/smime/Makefile.am b/camel/tests/smime/Makefile.am index b9078da..7e01124 100644 --- a/camel/tests/smime/Makefile.am +++ b/camel/tests/smime/Makefile.am @@ -27,3 +27,5 @@ pgp_LDADD = $(SMIME_TESTS_LDADD) # pgp_mime_LDADD = $(SMIME_TESTS_LDADD) # pkcs7_CPPFLAGS = $(SMIME_TESTS_CPPFLAGS) # pkcs7_LDADD = $(SMIME_TESTS_LDADD) + +-include $(top_srcdir)/git.mk diff --git a/camel/tests/stream/Makefile.am b/camel/tests/stream/Makefile.am index 132bae8..e611e39 100644 --- a/camel/tests/stream/Makefile.am +++ b/camel/tests/stream/Makefile.am @@ -24,3 +24,5 @@ test3_CPPFLAGS = $(STREAM_TESTS_CPPFLAGS) test3_LDADD = $(STREAM_TESTS_LDADD) #TESTS = test1 test2 test3 + +-include $(top_srcdir)/git.mk diff --git a/docs/Makefile.am b/docs/Makefile.am index b69bfe0..7890920 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1 +1,2 @@ -SUBDIRS = reference \ No newline at end of file +SUBDIRS = reference +-include $(top_srcdir)/git.mk diff --git a/docs/reference/.gitignore b/docs/reference/.gitignore index 45c18bb..2e54566 100644 --- a/docs/reference/.gitignore +++ b/docs/reference/.gitignore @@ -1,15 +1,22 @@ -*-decl-list.txt -*-decl.txt -*-unused.txt -*-undocumented.txt -*-undeclared.txt -*.args -*.hierarchy -*.interfaces -*.prerequisites -*.signals -*.stamp -html -xml -*.bak -version.xml +/*.bak +/*.lo +/*.o +/*.orig +/*.rej +/*.tab.c +/*~ +/.*.sw[nop] +/.deps +/.gitignore +/.libs +/GPATH +/GRTAGS +/GSYMS +/GTAGS +/ID +/Makefile +/Makefile.in +/TAGS +/_libs +/so_locations +/tags diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 157865b..f40e8d9 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -1,3 +1,5 @@ SUBDIRS = addressbook calendar camel libedataserver libedataserverui libebackend MKDB_OPTIONS=--output-format=xml + +-include $(top_srcdir)/git.mk diff --git a/docs/reference/addressbook/Makefile.am b/docs/reference/addressbook/Makefile.am index 9e227fa..4ceede1 100644 --- a/docs/reference/addressbook/Makefile.am +++ b/docs/reference/addressbook/Makefile.am @@ -1 +1,3 @@ SUBDIRS = libebook libedata-book + +-include $(top_srcdir)/git.mk diff --git a/docs/reference/addressbook/libebook/Makefile.am b/docs/reference/addressbook/libebook/Makefile.am index 2236ab7..293d502 100644 --- a/docs/reference/addressbook/libebook/Makefile.am +++ b/docs/reference/addressbook/libebook/Makefile.am @@ -34,3 +34,5 @@ GTKDOC_LIBS = \ # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make + +-include $(top_srcdir)/git.mk diff --git a/docs/reference/addressbook/libedata-book/Makefile.am b/docs/reference/addressbook/libedata-book/Makefile.am index e994281..f1eeb51 100644 --- a/docs/reference/addressbook/libedata-book/Makefile.am +++ b/docs/reference/addressbook/libedata-book/Makefile.am @@ -35,3 +35,5 @@ GTKDOC_LIBS = \ # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make + +-include $(top_srcdir)/git.mk diff --git a/docs/reference/calendar/Makefile.am b/docs/reference/calendar/Makefile.am index 771f259..a4f69e8 100644 --- a/docs/reference/calendar/Makefile.am +++ b/docs/reference/calendar/Makefile.am @@ -1 +1,3 @@ SUBDIRS = libecal libedata-cal + +-include $(top_srcdir)/git.mk diff --git a/docs/reference/calendar/libecal/Makefile.am b/docs/reference/calendar/libecal/Makefile.am index bf08eff..035785d 100644 --- a/docs/reference/calendar/libecal/Makefile.am +++ b/docs/reference/calendar/libecal/Makefile.am @@ -35,3 +35,5 @@ GTKDOC_LIBS = \ # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make + +-include $(top_srcdir)/git.mk diff --git a/docs/reference/calendar/libedata-cal/Makefile.am b/docs/reference/calendar/libedata-cal/Makefile.am index e0f20ae..812171b 100644 --- a/docs/reference/calendar/libedata-cal/Makefile.am +++ b/docs/reference/calendar/libedata-cal/Makefile.am @@ -41,3 +41,5 @@ GTKDOC_LIBS = \ # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make + +-include $(top_srcdir)/git.mk diff --git a/docs/reference/camel/Makefile.am b/docs/reference/camel/Makefile.am index cec7d65..af7f81e 100644 --- a/docs/reference/camel/Makefile.am +++ b/docs/reference/camel/Makefile.am @@ -73,3 +73,5 @@ EXTRA_DIST += \ $(DOC_MODULE)-docs.sgml \ $(DOC_MODULE)-sections.txt \ camel.hierarchy + +-include $(top_srcdir)/git.mk diff --git a/docs/reference/camel/camel-overrides.txt b/docs/reference/camel/camel-overrides.txt new file mode 100644 index 0000000..e69de29 diff --git a/docs/reference/libebackend/Makefile.am b/docs/reference/libebackend/Makefile.am index 83a03f2..c2c01a9 100644 --- a/docs/reference/libebackend/Makefile.am +++ b/docs/reference/libebackend/Makefile.am @@ -28,3 +28,5 @@ GTKDOC_LIBS = \ # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make + +-include $(top_srcdir)/git.mk diff --git a/docs/reference/libedataserver/Makefile.am b/docs/reference/libedataserver/Makefile.am index 279298a..065361a 100644 --- a/docs/reference/libedataserver/Makefile.am +++ b/docs/reference/libedataserver/Makefile.am @@ -28,3 +28,5 @@ GTKDOC_LIBS = \ # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make + +-include $(top_srcdir)/git.mk diff --git a/docs/reference/libedataserverui/Makefile.am b/docs/reference/libedataserverui/Makefile.am index 7231db8..64084f6 100644 --- a/docs/reference/libedataserverui/Makefile.am +++ b/docs/reference/libedataserverui/Makefile.am @@ -34,3 +34,5 @@ GTKDOC_LIBS = \ # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make + +-include $(top_srcdir)/git.mk diff --git a/git.mk b/git.mk new file mode 100644 index 0000000..739ba92 --- /dev/null +++ b/git.mk @@ -0,0 +1,178 @@ +# git.mk +# +# Copyright 2009, Red Hat, Inc. +# Written by Behdad Esfahbod +# +# Copying and distribution of this file, with or without modification, +# are permitted in any medium without royalty provided the copyright +# notice and this notice are preserved. +# +# The canonical source for this file is pango/git.mk, or whereever the +# header of pango/git.mk suggests in the future. +# +# To use in your project, import this file in your git repo's toplevel, +# then do "make -f git.mk". This modifies all Makefile.am files in +# your project to include git.mk. +# +# This enables automatic .gitignore generation. If you need to ignore +# more files, add them to the GITIGNOREFILES variable in your Makefile.am. +# But think twice before doing that. If a file has to be in .gitignore, +# chances are very high that it's a generated file and should be in one +# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES. +# +# The only case that you need to manually add a file to GITIGNOREFILES is +# when remove files in one of mostlyclean-local, clean-local, distclean-local, +# or maintainer-clean-local. +# +# Note that for files like editor backup, etc, there are better places to +# ignore them. See "man gitignore". +# +# If "make maintainer-clean" removes the files but they are not recognized +# by this script (that is, if "git status" shows untracked files still), send +# me the output of "git status" as well as your Makefile.am and Makefile for +# the directories involved. +# +# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see +# pango/Makefile.am. +# +# Don't EXTRA_DIST this file. It is supposed to only live in git clones, +# not tarballs. It serves no useful purpose in tarballs and clutters the +# build dir. +# +# This file knows how to handle autoconf, automake, libtool, gtk-doc, +# gnome-doc-utils, intltool. +# +# +# KNOWN ISSUES: +# +# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the +# submodule doesn't find us. If you have configure.{in,ac} files in +# subdirs, add a proxy git.mk file in those dirs that simply does: +# "include $(top_srcdir)/../git.mk". Add more ..'s to your taste. +# And add those files to git. See vte/gnome-pty-helper/git.mk for +# example. +# + +git-all: git-mk-install + +git-mk-install: + @echo Installing git makefile + @any_failed=; find $(top_srcdir) -name Makefile.am | while read x; do \ + if grep 'include .*/git.mk' $$x >/dev/null; then \ + echo $$x already includes git.mk; \ + else \ + failed=; \ + echo "Updating $$x"; \ + { cat $$x; \ + echo ''; \ + echo '-include $$(top_srcdir)/git.mk'; \ + } > $$x.tmp || failed=1; \ + if test x$$failed = x; then \ + mv $$x.tmp $$x || failed=1; \ + fi; \ + if test x$$failed = x; then : else \ + echo Failed updating $$x; >&2 \ + any_failed=1; \ + fi; \ + fi; done; test -z "$$any_failed" + +.PHONY: git-all git-mk-install + + +### .gitignore generation + +$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk + @echo Generating $@; \ + GTKDOCGITIGNOREFILES=; \ + test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x || \ + GTKDOCGITIGNOREFILES=" \ + $(DOC_MODULE)-decl-list.txt \ + $(DOC_MODULE)-decl.txt \ + tmpl/$(DOC_MODULE)-unused.sgml \ + tmpl/*.bak \ + xml html \ + "; \ + GNOMEDOCUTILSGITIGNOREFILES=; \ + test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x || \ + GNOMEDOCUTILSGITIGNOREFILES=" \ + $(_DOC_C_DOCS) \ + $(_DOC_LC_DOCS) \ + $(_DOC_OMF_ALL) \ + $(_DOC_DSK_ALL) \ + $(_DOC_HTML_ALL) \ + $(_DOC_POFILES) \ + */.xml2po.mo \ + */*.omf.out \ + "; \ + INTLTOOLGITIGNOREFILES=; test -f $(srcdir)/po/Makefile.in.in && \ + INTLTOOLGITIGNOREFILES=" \ + po/Makefile.in.in \ + po/Makefile.in \ + po/Makefile \ + po/*.gmo \ + po/*.mo \ + po/POTFILES \ + po/stamp-it \ + po/.intltool-merge-cache \ + intltool-extract.in \ + intltool-merge.in \ + intltool-update.in \ + "; \ + AUTOCONFGITIGNOREFILES=; test -f $(srcdir)/configure && \ + AUTOCONFGITIGNOREFILES=" \ + autom4te.cache \ + configure \ + config.h \ + stamp-h1 \ + libtool \ + config.lt \ + "; \ + for x in \ + .gitignore \ + $$GTKDOCGITIGNOREFILES \ + $$GNOMEDOCUTILSGITIGNOREFILES \ + $$INTLTOOLGITIGNOREFILES \ + $$AUTOCONFGITIGNOREFILES \ + $(GITIGNOREFILES) \ + $(CLEANFILES) \ + $(PROGRAMS) \ + $(EXTRA_PROGRAMS) \ + $(LTLIBRARIES) \ + so_locations \ + .libs _libs \ + $(MOSTLYCLEANFILES) \ + "*.$(OBJEXT)" \ + "*.lo" \ + $(DISTCLEANFILES) \ + $(am__CONFIG_DISTCLEAN_FILES) \ + $(CONFIG_CLEAN_FILES) \ + TAGS ID GTAGS GRTAGS GSYMS GPATH tags \ + "*.tab.c" \ + $(MAINTAINERCLEANFILES) \ + $(BUILT_SOURCES) \ + $(DEPDIR) \ + Makefile \ + Makefile.in \ + "*.orig" \ + "*.rej" \ + "*.bak" \ + "*~" \ + ".*.sw[nop]" \ + ; do echo /$$x; done | \ + sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \ + sed 's@/[.]/@/@g' | \ + LANG=C sort | uniq > $@.tmp && \ + mv $@.tmp $@; + +all: $(srcdir)/.gitignore gitignore-recurse +gitignore-recurse: + @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \ + done; \ + fi; +maintainer-clean: gitignore-clean +gitignore-clean: + -rm -f $(srcdir)/.gitignore +.PHONY: gitignore-clean gitignore-recurse + diff --git a/libebackend/Makefile.am b/libebackend/Makefile.am index e2ff4e0..44296cc 100644 --- a/libebackend/Makefile.am +++ b/libebackend/Makefile.am @@ -42,3 +42,5 @@ EXTRA_DIST = \ $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) DISTCLEANFILES = $(pkgconfig_DATA) + +-include $(top_srcdir)/git.mk diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am index e9c9e9d..08e93b1 100644 --- a/libedataserver/Makefile.am +++ b/libedataserver/Makefile.am @@ -99,3 +99,5 @@ EXTRA_DIST = \ eds-version.h.in DISTCLEANFILES = eds-version.h $(pkgconfig_DATA) + +-include $(top_srcdir)/git.mk diff --git a/libedataserverui/Makefile.am b/libedataserverui/Makefile.am index 2cfb28f..5f95c98 100644 --- a/libedataserverui/Makefile.am +++ b/libedataserverui/Makefile.am @@ -112,8 +112,13 @@ pkgconfig_DATA = libedataserverui-$(API_VERSION).pc ui_DATA = e-categories-dialog.ui e-name-selector-dialog.ui +BUILT_SOURCES = $(MARSHAL_GENERATED) + EXTRA_DIST = \ $(ui_DATA) \ $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) +CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = $(pkgconfig_DATA) + +-include $(top_srcdir)/git.mk diff --git a/servers/Makefile.am b/servers/Makefile.am index 04bb2e0..6d5f0c1 100644 --- a/servers/Makefile.am +++ b/servers/Makefile.am @@ -1 +1,3 @@ SUBDIRS = groupwise google + +-include $(top_srcdir)/git.mk diff --git a/servers/google/Makefile.am b/servers/google/Makefile.am index dd73ff2..c52f2d5 100644 --- a/servers/google/Makefile.am +++ b/servers/google/Makefile.am @@ -1 +1,3 @@ SUBDIRS = libgdata libgdata-google + +-include $(top_srcdir)/git.mk diff --git a/servers/google/libgdata-google/Makefile.am b/servers/google/libgdata-google/Makefile.am index c4ad77d..96c5ef9 100644 --- a/servers/google/libgdata-google/Makefile.am +++ b/servers/google/libgdata-google/Makefile.am @@ -34,3 +34,5 @@ EXTRA_DIST = $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) DISTCLEANFILES = $(pkgconfig_DATA) + +-include $(top_srcdir)/git.mk diff --git a/servers/google/libgdata/Makefile.am b/servers/google/libgdata/Makefile.am index 83e91e2..e42f06c 100644 --- a/servers/google/libgdata/Makefile.am +++ b/servers/google/libgdata/Makefile.am @@ -38,3 +38,5 @@ EXTRA_DIST = $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) DISTCLEANFILES = $(pkgconfig_DATA) + +-include $(top_srcdir)/git.mk diff --git a/servers/groupwise/Makefile.am b/servers/groupwise/Makefile.am index 92a6b8a..b815620 100644 --- a/servers/groupwise/Makefile.am +++ b/servers/groupwise/Makefile.am @@ -92,3 +92,5 @@ EXTRA_DIST = $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) DISTCLEANFILES = $(pkgconfig_DATA) + +-include $(top_srcdir)/git.mk diff --git a/win32/Makefile.am b/win32/Makefile.am index 356d18a..ae8a379 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -17,3 +17,5 @@ libedataserverui-1.2.la: dummy.la libedataserverui.def $(DLLTOOL) --output-lib=.libs/libedataserverui-1.2.dll.a --dllname=libedataserverui-1.2-$(libedataserverui_current_minus_age).dll --input-def=libedataserverui.def CLEANFILES = $(BOOTSTRAP_LIBS) + +-include $(top_srcdir)/git.mk -- 2.7.4