[passepartout] pass distcheck

[Sven Herzberg <herzi src gnome org>]

commit 71d31c709d650989e0d84fd5007db451eeb7d266
Author: Sven Herzberg <herzi lanedo com>
Date:   Sun Apr 12 12:25:40 2009 +0200

    pass distcheck
    
    * Makefile.am: make sure po/Makefile will have the ChangeLog is wants; properly
      distribute the desktop and intltool templates (and also clean them up
      properly)
    * po/.gitignore: ignore the ChangeLog file that we create for distdir
---
 Makefile.am   |   19 ++++++++++++++++---
 po/.gitignore |    1 +
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index dd59eb8..74fb772 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,9 +5,22 @@ SUBDIRS=\
        po \
        $(NULL)
 
-dist_applications_in_files=passepartout.desktop.in
-applications_DATA=$(dist_applications_in_files:.in=)
+applications_in_files=passepartout.desktop.in
+applications_DATA=$(applications_in_files:.in=)
 applicationsdir=$(datarootdir)/applications
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST = Doxyfile
+intltool_in_files=\
+	intltool-extract.in \
+	intltool-merge.in \
+	intltool-update.in \
+	$(NULL)
+
+EXTRA_DIST=Doxyfile $(applications_in_files) $(intltool_in_files) po/ChangeLog
+CLEANFILES=$(applications_DATA)
+DISTCLEANFILES=$(intltool_in_files:.in=)
+
+# AM_GLIB_GNU_GETTEXT requires a ChangeLog for "dist"
+po/ChangeLog:
+	touch po/ChangeLog
+
diff --git a/po/.gitignore b/po/.gitignore
index a8a590a..2c15876 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,5 +1,6 @@
 *.gmo
 *.pot
 .intltool-merge-cache
+ChangeLog
 Makefile.in.in
 POTFILES