Clean up data/Makefile.am

1 files changed, 35 insertions, 31 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index d119781fe..74966beaa 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,10 +1,22 @@
 SUBDIRS = icons
 
+EXTRA_DIST =
+CLEANFILES =
+
+# Bug reporting information script
 bugreportdir = $(libexecdir)/totem
 bugreport_SCRIPTS = totem-bugreport.py
+EXTRA_DIST += $(bugreport_SCRIPTS)
 
+# Man pages
 man_MANS = totem.1 totem-video-thumbnailer.1
+totem-video-thumbnailer.1: totem-video-thumbnailer.pod
+	$(AM_V_GEN) pod2man -c "" -s 1 -q none -n totem-video-thumbnailer -r GNOME $< > $@
+EXTRA_DIST += \
+	$(man_MANS)			\
+	totem-video-thumbnailer.pod
 
+# UI files and images
 stuffdir = $(pkgdatadir)
 stuff_DATA =				\
 	filmholes.png			\
@@ -17,7 +29,9 @@ stuff_DATA =				\
 	properties.ui			\
 	uri.ui				\
 	video-list.ui
+EXTRA_DIST += $(stuff_DATA)
 
+# Icons
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
 install-data-hook: update-icon-cache
@@ -31,11 +45,11 @@ update-icon-cache:
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+# Desktop file
 # totem.desktop.in.in.in = original
 # totem.desktop.in.in = by configure, includes the X-Gnome-Bugzilla
 # totem.desktop.in = includes the mime-types
 # totem.desktop = intltool-ised
-
 desktop_in_files = totem.desktop.in
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -43,53 +57,43 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 totem.desktop.in: totem.desktop.in.in mime-type-list.txt desktop.sh
 	$(AM_V_GEN) cat totem.desktop.in.in | sed 's,@FULL_LIBEXECDIR@,$(FULL_LIBEXECDIR),' > $@ &&\
-	$(SHELL) $(srcdir)/desktop.sh $(srcdir)/mime-type-list.txt	\
-	>> $@
+	$(SHELL) $(srcdir)/desktop.sh $(srcdir)/mime-type-list.txt >> $@
+
+EXTRA_DIST += desktop.sh
+CLEANFILES += \
+	$(desktop_in_files)	\
+	$(desktop_DATA)
 
+# Content type handling
 nodist_noinst_HEADERS = totem-mime-types.h nautilus-audio-mime-types.h
 totem-mime-types.h: mime-type-include.sh mime-type-list.txt mime-functions.sh
-	$(AM_V_GEN) $(srcdir)/mime-type-include.sh $(srcdir)/mime-type-list.txt	\
-	> $@
+	$(AM_V_GEN) $(srcdir)/mime-type-include.sh $(srcdir)/mime-type-list.txt	> $@
 nautilus-audio-mime-types.h: mime-type-include.sh mime-type-list.txt mime-functions.sh
-	$(AM_V_GEN) $(srcdir)/mime-type-include.sh --nautilus $(srcdir)/mime-type-list.txt	\
-	> $@
+	$(AM_V_GEN) $(srcdir)/mime-type-include.sh --nautilus $(srcdir)/mime-type-list.txt > $@
+
+EXTRA_DIST += \
+	mime-type-include.sh	\
+	mime-type-list.txt	\
+	mime-functions.sh
+CLEANFILES += \
+	totem-mime-types.h		\
+	nautilus-audio-mime-types.h
 
+# GSettings schemas, enum files and conversion file
 gsettings_ENUM_NAMESPACE = org.gnome.totem
 gsettings_ENUM_FILES = $(top_srcdir)/src/*.h $(top_srcdir)/src/backend/*.h
 gsettings_SCHEMAS = org.gnome.totem.gschema.xml
+CLEANFILES += $(gsettings_SCHEMAS)
 
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 convertdir = $(datadir)/GConf/gsettings
 convert_DATA = totem.convert
-
-# Man pages
-totem-video-thumbnailer.1: totem-video-thumbnailer.pod
-	$(AM_V_GEN) pod2man -c "" -s 1 -q none -n totem-video-thumbnailer -r GNOME $< > $@
+EXTRA_DIST += $(convert_DATA)
 
 # pkg-config file for the plugin API
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = totem.pc
 
-EXTRA_DIST = \
-	$(man_MANS)			\
-	$(stuff_DATA)			\
-	$(bugreport_SCRIPTS)		\
-	desktop.sh			\
-	mime-type-include.sh		\
-	mime-type-list.txt		\
-	mime-functions.sh		\
-	totem.convert			\
-	totem-video-thumbnailer.1	\
-	totem-video-thumbnailer.pod
-
-CLEANFILES = \
-	*.bak *.uip core* *.orig *~ 	\
-	$(desktop_in_files)		\
-	$(desktop_DATA)			\
-	$(gsettings_SCHEMAS)		\
-	totem-mime-types.h		\
-	nautilus-audio-mime-types.h
-
 -include $(top_srcdir)/git.mk