[totem] Fix automake's file cleaning lists



commit ea0ed37621f336a5e71c51caacc1998959469143
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sat Sep 4 20:24:49 2010 +0100

    Fix automake's file cleaning lists
    
    Our transition to git.mk exposed a few files which weren't getting cleaned
    at the correct point. This also adds a gtk-doc file which we were missing.

 Makefile.am                           |   26 +++++++++++++++++++++++++-
 data/Makefile.am                      |    7 ++-----
 src/plugins/sample-python/Makefile.am |    7 ++++---
 3 files changed, 31 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 447abc2..4f6c1ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,10 +16,34 @@ EXTRA_DIST =			\
 	totem.spec		\
 	omf.make		\
 	xmldocs.make		\
-	gnome-doc-utils.make
+	gnome-doc-utils.make	\
+	ChangeLog.pre-gitlog	\
+	MAINTAINERS		\
+	totem.doap
 
 CLEANFILES = totem.spec
 
+MAINTAINERCLEANFILES = \
+	$(srcdir)/INSTALL \
+	$(srcdir)/aclocal.m4 \
+	$(srcdir)/autoscan.log \
+	$(srcdir)/compile \
+	$(srcdir)/config.guess \
+	$(srcdir)/config.h.in \
+	$(srcdir)/config.sub \
+	$(srcdir)/configure.scan \
+	$(srcdir)/depcomp \
+	$(srcdir)/install-sh \
+	$(srcdir)/ltmain.sh \
+	$(srcdir)/missing \
+	$(srcdir)/mkinstalldirs \
+	$(srcdir)/omf.make \
+	$(srcdir)/py-compile \
+	$(srcdir)/xmldocs.make \
+	$(srcdir)/gtk-doc.make \
+	$(srcdir)/ChangeLog \
+	`find "$(srcdir)" -type f -name Makefile.in -print`
+
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update \
 		 gnome-doc-utils.make
 
diff --git a/data/Makefile.am b/data/Makefile.am
index d1c0b49..0a1532b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -90,12 +90,9 @@ CLEANFILES = \
 	*.bak *.uip core* *.orig *~ 	\
 	$(desktop_in_files)		\
 	$(desktop_DATA)			\
-	$(gsettings_SCHEMAS)		\
+	org.gnome.totem.gschema.xml	\
+	org.gnome.totem.gschema.xml.in	\
 	totem-mime-types.h		\
 	nautilus-audio-mime-types.h
 
-DISTCLEANFILES = $(gsettings_SCHEMAS)
-
-MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
-
 -include $(top_srcdir)/git.mk
diff --git a/docs/reference/totem-overrides.txt b/docs/reference/totem-overrides.txt
new file mode 100644
index 0000000..e69de29
diff --git a/src/plugins/sample-python/Makefile.am b/src/plugins/sample-python/Makefile.am
index 32c93f6..0c77f89 100644
--- a/src/plugins/sample-python/Makefile.am
+++ b/src/plugins/sample-python/Makefile.am
@@ -5,11 +5,12 @@ plugin_in_files = sample-python.totem-plugin.in
 
 %.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-#plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
+# Note: This isn't plugin_DATA so that we don't install the files (this is a _sample_ plugin)
+plugin_data = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
 
 EXTRA_DIST = $(plugin_in_files) sample-python.py
 
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+CLEANFILES = $(plugin_data)
+DISTCLEANFILES = $(plugin_data)
 
 -include $(top_srcdir)/git.mk



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]