aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-08-26 01:49:58 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-08-26 02:02:14 +0800
commit1b706132cf01c2a42cc9a012472b71675cc0902e (patch)
tree39af77b978969c241d84b60342f0dd6e0d8551c5
parentf6355e1fde1491c6e451975902906ea9921fee4a (diff)
downloadgsoc2013-evolution-1b706132cf01c2a42cc9a012472b71675cc0902e.tar
gsoc2013-evolution-1b706132cf01c2a42cc9a012472b71675cc0902e.tar.gz
gsoc2013-evolution-1b706132cf01c2a42cc9a012472b71675cc0902e.tar.bz2
gsoc2013-evolution-1b706132cf01c2a42cc9a012472b71675cc0902e.tar.lz
gsoc2013-evolution-1b706132cf01c2a42cc9a012472b71675cc0902e.tar.xz
gsoc2013-evolution-1b706132cf01c2a42cc9a012472b71675cc0902e.tar.zst
gsoc2013-evolution-1b706132cf01c2a42cc9a012472b71675cc0902e.zip
Deal with untracked files in git.
-rw-r--r--Makefile.am11
-rw-r--r--configure.ac1
-rw-r--r--doc/reference/Makefile.am2
-rw-r--r--m4/Makefile.am1
4 files changed, 14 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 6161c2a664..f79d67fbd8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,7 @@ HELP_SUBDIR=help
endif
SUBDIRS = \
+ m4 \
win32 \
data \
smclient \
@@ -86,7 +87,15 @@ MAINTAINERCLEANFILES = \
$(srcdir)/missing \
$(srcdir)/mkinstalldirs \
$(srcdir)/gnome-doc-utils.make \
- $(srcdir)/gtk-doc.make
+ $(srcdir)/gtk-doc.make \
+ $(srcdir)/m4/gnome-doc-utils.m4 \
+ $(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
# Scrollkeeper must be disabled for distcheck to work because
# distcheck uses a custom prefix. See GNOME bug #354357.
diff --git a/configure.ac b/configure.ac
index fc9aec4454..efcf2548a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2059,6 +2059,7 @@ calendar/gui/Makefile
calendar/gui/alarm-notify/Makefile
calendar/gui/dialogs/Makefile
composer/Makefile
+m4/Makefile
mail/Makefile
mail/default/Makefile
mail/default/C/Makefile
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index d7c539dc98..48d38adb0a 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -1 +1,3 @@
SUBDIRS = shell
+
+-include $(top_srcdir)/git.mk
diff --git a/m4/Makefile.am b/m4/Makefile.am
new file mode 100644
index 0000000000..ae44c94bff
--- /dev/null
+++ b/m4/Makefile.am
@@ -0,0 +1 @@
+-include $(top_srcdir)/git.mk