[gnome-panel/merge-gnome-applets] build: add two distcheck configure flags

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 4c4cfeabc7c2f7ab61c6f7a8a9e0255db6a08632
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Jun 17 00:02:07 2014 +0300

    build: add two distcheck configure flags

 Makefile.am               |    7 ++++++-
 gnome-applets/Makefile.am |   37 -------------------------------------
 2 files changed, 6 insertions(+), 38 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 136bf8c..94d93c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,12 @@ SUBDIRS =                    \
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection --disable-scrollkeeper
+DISTCHECK_CONFIGURE_FLAGS = \
+       --enable-gtk-doc \
+       --enable-introspection \
+       --disable-scrollkeeper \
+       --enable-mini-commander \
+       --enable-mixer-applet
 
 EXTRA_DIST = \
        COPYING-DOCS            \
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index f296ad3..51786ce 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -1,21 +1,3 @@
-DIST_SUBDIRS = \
-       po              \
-       drivemount      \
-       charpick        \
-       geyes           \
-       mini-commander  \
-       battstat        \
-       multiload       \
-       gweather        \
-       man             \
-       accessx-status  \
-       stickynotes     \
-       trashapplet     \
-       cpufreq         \
-       invest-applet   \
-       mixer           \
-       null_applet
-
 EXTRA_DIST = \
        MAINTAINERS                     \
        m4/ac-define-dir.m4             \
@@ -26,25 +8,6 @@ EXTRA_DIST = \
        intltool-extract.in             \
        intltool-merge.in
 
-DISTCHECK_CONFIGURE_FLAGS =    \
-       --enable-mini-commander \
-       --enable-mixer-applet
-
-# We build the ChangeLog from the git log
-ChangeLog:
-       @if test -f $(top_srcdir)/.git/HEAD; then \
-               git log --stat --no-color --since=2009-05-23 > $@; \
-       fi
-
-dist: ChangeLog
-
-# Make sure the ChangeLog is updated every time
-.PHONY: ChangeLog
-
-ACLOCAL_AMFLAGS = -I m4
-
 DISTCLEANFILES = intltool-extract      \
                 intltool-merge         \
                 intltool-update
-
--include $(top_srcdir)/git.mk