Commit d523f10d authored by Matthew Barnes's avatar Matthew Barnes

Use Behdad's brilliant git.mk to generate .gitignore files.

parent 186e97cf
# for all subdirectories
Makefile.in
Makefile
.libs
.deps
*.o
*.lo
*.la
.*.swp
# autofoo stuff here
aclocal.m4
autom4te.cache
compile
config.*
configure
depcomp
gnome-doc-utils.make
gtk-doc.make
install-sh
intltool-*.in
libtool
ltmain.sh
missing
mkinstalldirs
stamp-*
# misc generated stuff
*.conduit
*.error
*.schemas
*.server
......@@ -92,3 +92,5 @@ cde-install: install dtappintegrate
cde-uninstall: dtappunintegrate uninstall
endif
-include $(top_srcdir)/git.mk
......@@ -32,3 +32,5 @@ libevolution_a11y_la_LIBADD = \
e-table/libgal-a11y-etable.la \
$(top_builddir)/e-util/libeutil.la \
$(GNOME_PLATFORM_LIBS)
-include $(top_srcdir)/git.mk
......@@ -31,3 +31,5 @@ libevolution_addressbook_a11y_la_LDFLAGS = $(NO_UNDEFINED)
libevolution_addressbook_a11y_la_LIBADD = \
$(WIN32_BOOTSTRAP_LIBS) \
$(EVOLUTION_ADDRESSBOOK_LIBS)
-include $(top_srcdir)/git.mk
......@@ -52,3 +52,5 @@ libevolution_calendar_a11y_la_LIBADD = \
$(WIN32_BOOTSTRAP_LIBS) \
$(top_builddir)/a11y/libevolution-a11y.la \
$(EVOLUTION_CALENDAR_LIBS)
-include $(top_srcdir)/git.mk
......@@ -40,3 +40,5 @@ libgal_a11y_etable_la_SOURCES = \
gal-a11y-e-table-column-header.h \
gal-a11y-e-table-item-factory.h \
gal-a11y-e-table-factory.h
-include $(top_srcdir)/git.mk
......@@ -11,3 +11,5 @@ libgal_a11y_etext_la_SOURCES = \
gal-a11y-e-text.c \
gal-a11y-e-text-factory.h \
gal-a11y-e-text.h
-include $(top_srcdir)/git.mk
......@@ -32,3 +32,5 @@ libevolution_widgets_a11y_la_LIBADD = \
$(top_builddir)/a11y/libevolution-a11y.la \
$(top_builddir)/e-util/libeutil.la \
$(E_WIDGETS_LIBS)
-include $(top_srcdir)/git.mk
......@@ -19,3 +19,5 @@ dist-hook:
BUILT_SOURCES = $(error_DATA)
CLEANFILES = $(BUILT_SOURCES)
-include $(top_srcdir)/git.mk
......@@ -36,3 +36,5 @@ EXTRA_DIST = \
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
-include $(top_srcdir)/git.mk
SUBDIRS = merging contact-editor contact-list-editor widgets component
-include $(top_srcdir)/git.mk
......@@ -126,3 +126,5 @@ evolution-addressbook.pure: evolution-addressbook
$(PLINK) $(evolution_addressbook_LDFLAGS) $(evolution_addressbook_OBJECTS) $(evolution_addressbook_LDADD) $(LIBS)
endif
-include $(top_srcdir)/git.mk
......@@ -40,3 +40,5 @@ glade_DATA = \
fullname.glade
EXTRA_DIST= $(glade_DATA)
-include $(top_srcdir)/git.mk
......@@ -36,3 +36,5 @@ libecontactlisteditor_la_LIBADD = \
glade_DATA = contact-list-editor.glade
EXTRA_DIST = $(glade_DATA)
-include $(top_srcdir)/git.mk
......@@ -20,3 +20,5 @@ glade_DATA = eab-contact-duplicate-detected.glade \
EXTRA_DIST = \
$(glade_DATA)
-include $(top_srcdir)/git.mk
......@@ -68,3 +68,5 @@ etspec_DATA= e-addressbook-view.etspec
EXTRA_DIST = \
$(etspec_DATA) \
addresstypes.xml
-include $(top_srcdir)/git.mk
......@@ -23,3 +23,5 @@ libevolution_addressbook_importers_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/addressbook/util/libeabutil.la \
$(IMPORTERS_LIBS)
-include $(top_srcdir)/git.mk
......@@ -46,3 +46,5 @@ contact_print_style_editor_test_LDADD = \
EXTRA_DIST = \
$(ecps_DATA)
-include $(top_srcdir)/git.mk
......@@ -38,3 +38,5 @@ evolution-addressbook-clean: evolution-addressbook-clean.in Makefile
-e 's?\@PERL\@?@PERL@?g' \
< $(srcdir)/evolution-addressbook-clean.in > evolution-addressbook-clean.tmp \
&& mv evolution-addressbook-clean.tmp evolution-addressbook-clean
-include $(top_srcdir)/git.mk
......@@ -25,3 +25,5 @@ libeabutil_la_LIBADD = \
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
-include $(top_srcdir)/git.mk
......@@ -12,3 +12,5 @@ EXTRA_DIST = \
empty.xpm \
jump.xpm \
$(images_DATA)
-include $(top_srcdir)/git.mk
......@@ -22,3 +22,5 @@ dist-hook:
BUILT_SOURCES = $(error_DATA)
CLEANFILES = $(BUILT_SOURCES)
-include $(top_srcdir)/git.mk
......@@ -13,3 +13,5 @@ INCLUDES = \
libevolution_calendarprivate_la_SOURCES = \
authentication.c \
authentication.h
-include $(top_srcdir)/git.mk
SUBDIRS = common calendar memo todo
-include $(top_srcdir)/git.mk
......@@ -39,3 +39,5 @@ EXTRA_DIST = \
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
-include $(top_srcdir)/git.mk
......@@ -22,3 +22,5 @@ libecalendar_common_conduit_la_LIBADD = \
$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-include $(top_srcdir)/git.mk
......@@ -39,3 +39,5 @@ EXTRA_DIST = \
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
-include $(top_srcdir)/git.mk
......@@ -39,3 +39,5 @@ EXTRA_DIST = \
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
-include $(top_srcdir)/git.mk
......@@ -280,3 +280,5 @@ endif
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
-include $(top_srcdir)/git.mk
......@@ -67,3 +67,5 @@ CLEANFILES = $(BUILT_SOURCES)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
-include $(top_srcdir)/git.mk
......@@ -102,3 +102,5 @@ dist-hook:
EXTRA_DIST = \
$(glade_DATA)
-include $(top_srcdir)/git.mk
......@@ -3,3 +3,5 @@ idl_DATA = \
EXTRA_DIST = \
$(idl_DATA)
-include $(top_srcdir)/git.mk
......@@ -18,3 +18,5 @@ libevolution_calendar_importers_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/calendar/common/libevolution-calendarprivate.la \
$(EVOLUTION_CALENDAR_LIBS)
-include $(top_srcdir)/git.mk
......@@ -62,3 +62,5 @@ CLEANFILES = $(BUILT_SOURCES)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
-include $(top_srcdir)/git.mk
......@@ -81,3 +81,5 @@ EXTRA_DIST = \
$(noinst_MANS)
-include $(top_srcdir)/git.mk
SUBDIRS = dt
\ No newline at end of file
SUBDIRS = dt
-include $(top_srcdir)/git.mk
SUBDIRS = appconfig
\ No newline at end of file
SUBDIRS = appconfig
-include $(top_srcdir)/git.mk
SUBDIRS = appmanager icons types
\ No newline at end of file
SUBDIRS = appmanager icons types
-include $(top_srcdir)/git.mk
SUBDIRS = Ximian
\ No newline at end of file
SUBDIRS = Ximian
-include $(top_srcdir)/git.mk
......@@ -4,3 +4,5 @@ if HAVE_DTAPPINTEGRATE
cdeappmanagerdir = $(privdatadir)/cde_app_root/dt/appconfig/appmanager/C/Ximian
cdeappmanager_SCRIPTS = Evolution
endif
-include $(top_srcdir)/git.mk
SUBDIRS = C
\ No newline at end of file
SUBDIRS = C
-include $(top_srcdir)/git.mk
......@@ -13,3 +13,5 @@ cdeiconsdir = $(privdatadir)/cde_app_root/dt/appconfig/icons/C
cdeicons_DATA = $(ICONS)
endif
-include $(top_srcdir)/git.mk
SUBDIRS = C
\ No newline at end of file
SUBDIRS = C
-include $(top_srcdir)/git.mk
......@@ -4,3 +4,5 @@ if HAVE_DTAPPINTEGRATE
cdetypesdir = $(privdatadir)/cde_app_root/dt/appconfig/types/C
cdetypes_DATA = Ximian.dt
endif
-include $(top_srcdir)/git.mk
......@@ -167,3 +167,5 @@ uninstall-icons:
install-data-local: install-icons update-icon-cache
uninstall-local: uninstall-icons update-icon-cache
-include $(top_srcdir)/git.mk
## Process this file with automake to produce Makefile.in
SUBDIRS=camel
-include $(top_srcdir)/git.mk
......@@ -99,3 +99,5 @@ dist-hook:
.PHONY : html sgml templates scan
-include $(top_srcdir)/git.mk
EXTRA_DIST = ChangeLog.pre-1-4
-include $(top_srcdir)/git.mk
......@@ -177,3 +177,5 @@ dist-hook: dist-check-gtkdoc dist-hook-local
# -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
.PHONY : dist-hook-local
-include $(top_srcdir)/git.mk
......@@ -193,3 +193,5 @@ dist-hook: dist-check-gtkdoc dist-hook-local
.PHONY : dist-hook-local
-include $(top_srcdir)/git.mk
......@@ -171,3 +171,5 @@ CLEANFILES = $(BUILT_SOURCES)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
-include $(top_srcdir)/git.mk
......@@ -57,3 +57,5 @@ errordir = $(privdatadir)/errors
BUILT_SOURCES = $(error_DATA)
CLEANFILES = $(BUILT_SOURCES)
-include $(top_srcdir)/git.mk
# 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
......@@ -108,3 +108,5 @@ DOC_LINGUAS = cs de el en_GB es eu fr oc ru sv mk
check:
xmllint --valid --noout $(top_srcdir)/help/C/evolution.xml
-include $(top_srcdir)/git.mk
......@@ -34,3 +34,5 @@ include $(top_srcdir)/help/sgmldocs.make
dist-hook: app-dist-hook
EXTRA_DIST = ChangeLog.pre-1-4
-include $(top_srcdir)/git.mk
......@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
EXTRA_DIST = \
$(HELP_FILES) \
quickref.tex
-include $(top_srcdir)/git.mk
SUBDIRS = C ca cs de es fr hu it oc pl pt sv sq
EXTRA_DIST = evolution-logo.eps
-include $(top_srcdir)/git.mk
......@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
EXTRA_DIST = \
$(HELP_FILES) \
quickref.tex
-include $(top_srcdir)/git.mk
......@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
EXTRA_DIST = \
$(HELP_FILES) \
quickref.tex
-include $(top_srcdir)/git.mk
......@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
EXTRA_DIST = \
$(HELP_FILES) \
quickref.tex
-include $(top_srcdir)/git.mk
......@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
EXTRA_DIST = \
$(HELP_FILES) \
quickref.tex
-include $(top_srcdir)/git.mk
......@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
EXTRA_DIST = \
$(HELP_FILES) \
quickref.tex
-include $(top_srcdir)/git.mk
......@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
EXTRA_DIST = \
$(HELP_FILES) \
quickref.tex
-include $(top_srcdir)/git.mk
......@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
EXTRA_DIST = \
$(HELP_FILES) \
quickref.tex
-include $(top_srcdir)/git.mk
......@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
EXTRA_DIST = \
$(HELP_FILES) \
quickref.tex
-include $(top_srcdir)/git.mk
......@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
EXTRA_DIST = \
$(HELP_FILES) \
quickref.tex
-include $(top_srcdir)/git.mk
......@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
EXTRA_DIST = \
$(HELP_FILES) \
quickref.tex
-include $(top_srcdir)/git.mk
......@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
EXTRA_DIST = \
$(HELP_FILES) \
quickref.tex
-include $(top_srcdir)/git.mk
......@@ -6,3 +6,5 @@ quickref_DATA = $(HELP_FILES)
EXTRA_DIST = \
$(HELP_FILES) \
quickref.tex
-include $(top_srcdir)/git.mk
......@@ -311,3 +311,5 @@ BUILT_SOURCES = $(MAIL_IDL_GENERATED) $(server_DATA) $(error_DATA)
CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = $(schema_DATA)
-include $(top_srcdir)/git.mk
......@@ -5,3 +5,5 @@ defaultlocal_DATA = \
Inbox
EXTRA_DIST = $(defaultlocal_DATA)
-include $(top_srcdir)/git.mk
......@@ -2,3 +2,5 @@
SUBDIRS=C ca cs zh_CN de es fi fr hu it ja ko lt mk nl pl pt sr sr@latin sv
-include $(top_srcdir)/git.mk
......@@ -5,3 +5,5 @@ defaultlocal_DATA = \
Inbox
EXTRA_DIST = $(defaultlocal_DATA)
-include $(top_srcdir)/git.mk
......@@ -5,3 +5,5 @@ defaultlocal_DATA = \
Inbox
EXTRA_DIST = $(defaultlocal_DATA)
-include $(top_srcdir)/git.mk
......@@ -5,3 +5,5 @@ defaultlocal_DATA = \
Inbox
EXTRA_DIST = $(defaultlocal_DATA)
-include $(top_srcdir)/git.mk
......@@ -5,3 +5,5 @@ defaultlocal_DATA = \
Inbox
EXTRA_DIST = $(defaultlocal_DATA)
-include $(top_srcdir)/git.mk
......@@ -5,3 +5,5 @@ defaultlocal_DATA = \
Inbox
EXTRA_DIST = $(defaultlocal_DATA)
-include $(top_srcdir)/git.mk
......@@ -5,3 +5,5 @@ defaultlocal_DATA = \
Inbox
EXTRA_DIST = $(defaultlocal_DATA)
-include $(top_srcdir)/git.mk
......@@ -5,3 +5,5 @@ defaultlocal_DATA = \
Inbox
EXTRA_DIST = $(defaultlocal_DATA)