From c0edb20379498fd89956914979eecf61ae5a5c89 Mon Sep 17 00:00:00 2001
From: William Jon McCann <jmccann@redhat.com>
Date: Wed, 22 Oct 2008 00:54:14 -0400
Subject: fix more distcheck issues

---
 Makefile.am        | 23 ++++++++++++++++++++---
 po/POTFILES.in     |  3 +--
 stereo/Makefile.am |  9 +++++++++
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0214879..174861c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@ NULL =
 
 SUBDIRS = 			\
 	stereo			\
+	po			\
 	$(NULL)
 
 themedir = $(datadir)/sounds/freedesktop
@@ -9,9 +10,8 @@ theme_DATA = index.theme
 
 THEME_IN_FILES = index.theme.in
 
-%.theme:   %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(IN
-TLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge
--cache
+%.theme: %.theme.in
+	$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 EXTRA_DIST = \
 	README			\
@@ -21,6 +21,23 @@ EXTRA_DIST = \
 DISTCLEANFILES = \
 	$(NULL)
 
+MAINTAINERCLEANFILES =		\
+	*~			\
+	intltool-*.in		\
+	compile			\
+	configure		\
+	INSTALL			\
+	install-sh		\
+	missing			\
+	mkinstalldirs		\
+	config.guess		\
+	ltmain.sh		\
+	config.sub		\
+	depcomp			\
+	Makefile.in		\
+	config.h.*		\
+	aclocal.m4		\
+	$(NULL)
 
 # Creating ChangeLog from git log (taken from cairo/Makefile.am):
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3b4d104..76c190d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,3 @@
-[encoding: UTF-8]
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-index.theme.in
\ No newline at end of file
+[type: gettext/ini] index.theme.in
diff --git a/stereo/Makefile.am b/stereo/Makefile.am
index d2af38c..cce4ad0 100644
--- a/stereo/Makefile.am
+++ b/stereo/Makefile.am
@@ -45,5 +45,14 @@ sound_DATA =                            \
 	window-slide.ogg		\
 	$(NULL)
 
+EXTRA_DIST =            \
+	$(sound_DATA)	\
+	$(NULL)
+
 DISTCLEANFILES = \
 	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in		\
+	$(NULL)
-- 
cgit