Remove useless m4/Makefile.am and add ChangeLog to distcleanfiles. make distckeck...

[empathy.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9e4c06f3adbc98058a3af1e825890d83428bd739..2d207666bf88c8de46e79b4f48e7aed6f26c8746 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,20 @@
-SUBDIRS = po data libempathy libempathy-gtk src doc
+SUBDIRS = po data libempathy libempathy-gtk src docs
+
+if HAVE_MEGAPHONE
+SUBDIRS += megaphone
+endif
+
+if HAVE_NOTHERE
+SUBDIRS += nothere
+endif
+
+if HAVE_PYTHON
+SUBDIRS += python
+endif
+
+if HAVE_TESTS
+SUBDIRS += tests
+endif
 
 DISTCHECK_CONFIGURE_FLAGS =    \
        --disable-scrollkeeper  \
@@ -11,11 +27,13 @@ INTLTOOL =                  \
 
 EXTRA_DIST =                   \
         ChangeLog               \
+        ChangeLog.old           \
         README                  \
        CONTRIBUTORS            \
        $(INTLTOOL)
 
 DISTCLEANFILES =               \
+        ChangeLog               \
        intltool-extract        \
        intltool-merge          \
        intltool-update
@@ -24,6 +42,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
+