Merge commit 'cassidy/irc'

[empathy.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e33ab3634038ade26a821f7631df316e13672066..2d0d907ff443415d925296b61e4533bba1072530 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,8 @@ if HAVE_TESTS
 SUBDIRS += tests
 endif
 
+ACLOCAL_AMFLAGS = -I m4
+
 DISTCHECK_CONFIGURE_FLAGS =    \
        --disable-scrollkeeper  \
        --enable-gtk-doc
@@ -27,11 +29,14 @@ INTLTOOL =                  \
 
 EXTRA_DIST =                   \
         ChangeLog               \
+        ChangeLog.old           \
         README                  \
        CONTRIBUTORS            \
+       autogen.sh              \
        $(INTLTOOL)
 
 DISTCLEANFILES =               \
+        ChangeLog               \
        intltool-extract        \
        intltool-merge          \
        intltool-update
@@ -40,6 +45,11 @@ DISTCLEANFILES =             \
 # 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
+ChangeLog: Makefile.am
+       git-log --pretty=short > ChangeLog
+       
+
+dist: ChangeLog
+
+.PHONY: ChangeLog
+