X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=Makefile.am;h=d8cebf0c9eecd6152bb2ce5e9bf50c53c16ef6a9;hp=3743916f56c996e870703b78c3ef0d5d57f00cb6;hb=1f5c37347a4d759b8f3b56e3e9986a3f255b893c;hpb=c657583832cbf675516a105c1f7bbc6bebea6e34

diff --git a/Makefile.am b/Makefile.am
index 3743916f..d8cebf0c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = po data libempathy libempathy-gtk src doc
+SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help
 
 if HAVE_MEGAPHONE
 SUBDIRS += megaphone
@@ -16,30 +16,45 @@ if HAVE_TESTS
 SUBDIRS += tests
 endif
 
-DISTCHECK_CONFIGURE_FLAGS =	\
-	--disable-scrollkeeper  \
-	--enable-gtk-doc
+ACLOCAL_AMFLAGS = -I m4
 
-INTLTOOL = 			\
-	intltool-extract.in 	\
-	intltool-merge.in 	\
-	intltool-update.in
+DISTCHECK_CONFIGURE_FLAGS =		\
+	--disable-scrollkeeper		\
+	--disable-schemas-install	\
+	--enable-gtk-doc
 
 EXTRA_DIST = 			\
         ChangeLog               \
+        ChangeLog.old           \
         README                  \
 	CONTRIBUTORS		\
-	$(INTLTOOL)
+	autogen.sh
 
 DISTCLEANFILES = 		\
-	intltool-extract	\
-	intltool-merge		\
-	intltool-update
+        ChangeLog
 
 # Workaround broken scrollkeeper that doesn't remove its files on
 # uninstall.
 distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
 
-dist-hook:
-	chmod a+w ${distdir}/ChangeLog
-	if test -d _darcs; then darcs changes >${distdir}/ChangeLog; fi
+distclean-local:
+	if test "x$(srdcir)" = "x."; then :; else \
+		rm -f ChangeLog; \
+	fi
+
+ChangeLog:
+	@echo Creating $@
+	@if test -d "$(srcdir)/.git"; then \
+	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log EMPATHY_2_27_1.. --stat) | fmt --split-only > $@.tmp \
+	  && mv -f $@.tmp $@ \
+	  || ($(RM) $@.tmp; \
+	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
+	else \
+	  test -f $@ || \
+	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
+	  echo A git checkout and git-log is required to generate this file >> $@); \
+	fi
+
+.PHONY: ChangeLog
+