X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=Makefile.am;h=bd8dd6828cff6d5addacab4eae378164295771f5;hp=ebbbf346d5fe22e434231b49f70f06da3a40d31c;hb=f3842fe890a0819331c3a5901437c88b2e88d282;hpb=f600051da4c1a2d92f4c643f8b33e3efc4490315

diff --git a/Makefile.am b/Makefile.am
index ebbbf346..bd8dd682 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,28 +1,51 @@
-SUBDIRS = po data libempathy libempathy-gtk src doc
+SUBDIRS = tools extensions po data libempathy libempathy-gtk src help tests
 
-DISTCHECK_CONFIGURE_FLAGS =	\
-	--disable-scrollkeeper
+if HAVE_NST
+SUBDIRS += nautilus-sendto-plugin
+endif
 
-INTLTOOL = 			\
-	intltool-extract.in 	\
-	intltool-merge.in 	\
-	intltool-update.in
+ACLOCAL_AMFLAGS = -I m4
+
+DISTCHECK_CONFIGURE_FLAGS =		\
+	--disable-scrollkeeper		\
+	--disable-schemas-install
 
 EXTRA_DIST = 			\
-        ChangeLog               \
-        README                  \
-	CONTRIBUTORS		\
-	$(INTLTOOL)
+        CONTRIBUTORS \
+        COPYING-DOCS \
+        COPYING.LGPL \
+        COPYING.SHARE-ALIKE \
+        ChangeLog \
+        ChangeLog.old \
+        README \
+        autogen.sh \
+        $(NULL)
 
 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
+