Autogenerate the .gitignore files using git.mk

12 files changed, 37 insertions, 41 deletions

diff --git a/docs/.gitignore b/docs/.gitignore
deleted file mode 100644
index 42890901..00000000
--- a/docs/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile.in
-Makefile
-packagekit-qt
-
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 39026b7c..cc1c6ddf 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -2,6 +2,9 @@ NULL =
 
 SUBDIRS = 						\
 	api						\
-	html						\
-	$(NULL)
+	html
 
+MAINTAINERCLEANFILES =					\
+	packagekit-qt
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/api/.gitignore b/docs/api/.gitignore
deleted file mode 100644
index 3c13afb9..00000000
--- a/docs/api/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-Makefile.in
-Makefile.libs
-.libs
-*.bak
-*.gcno
-*.out
-*.txt
-tmpl
-xml
-html
-html-build.stamp
-html.stamp
-PackageKit-docs.xml
-PackageKit.args
-PackageKit.hierarchy
-PackageKit.interfaces
-PackageKit.prerequisites
-PackageKit.signals
-PackageKit.types
-scan-build.stamp
-sgml-build.stamp
-sgml.stamp
-tmpl-build.stamp
-tmpl.stamp
-version.xml
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index 35e5eb3b..75d7397f 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -61,9 +61,8 @@ HTML_IMAGES =						\
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 content_files =						\
 	version.xml					\
-	dbus/org.freedesktop.PackageKit.ref.xml			\
-	dbus/org.freedesktop.PackageKit.Transaction.ref.xml		\
-	$(NULL)
+	dbus/org.freedesktop.PackageKit.ref.xml		\
+	dbus/org.freedesktop.PackageKit.Transaction.ref.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files
@@ -99,3 +98,19 @@ include $(top_srcdir)/gtk-doc.make
 # Other files to distribute
 EXTRA_DIST += version.xml.in
 
+CLEANFILES =						\
+	*.txt						\
+	*.types						\
+	*.args						\
+	*.hierarchy					\
+	*.interfaces					\
+	*.prerequisites					\
+	*.signals					\
+	*.stamp						\
+	tmpl
+
+DISTCLEANFILES =					\
+	org.freedesktop.PackageKit.ref.xml		\
+	org.freedesktop.PackageKit.Transaction.ref.xml
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/api/dbus/.gitignore b/docs/api/dbus/.gitignore
deleted file mode 100644
index 8a26d41c..00000000
--- a/docs/api/dbus/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.ref.xml
-
diff --git a/docs/api/dbus/Makefile.am b/docs/api/dbus/Makefile.am
index 164a65ea..36e4b563 100644
--- a/docs/api/dbus/Makefile.am
+++ b/docs/api/dbus/Makefile.am
@@ -11,11 +11,15 @@ org.freedesktop.PackageKit.Transaction.ref.xml : $(top_srcdir)/src/org.freedeskt
 	echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
 	$(XSLTPROC) $(top_srcdir)/docs/api/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@
 
-#$(top_srcdir)/docs/api/dbus/spec-to-docbook $(top_srcdir)/src/org.freedesktop.PackageKit.xml
-
 endif
 
 EXTRA_DIST = spec-to-docbook.xsl dbus-introspect-docs.dtd
 
+CLEANFILES =						\
+	org.freedesktop.PackageKit.Transaction.ref.xml	\
+	org.freedesktop.PackageKit.ref.xml
+
 clean-local :
 	rm -f *~ *.ref.xml
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/html/.gitignore b/docs/html/.gitignore
deleted file mode 100644
index b05de43f..00000000
--- a/docs/html/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.bak
-
diff --git a/docs/html/Makefile.am b/docs/html/Makefile.am
index bbf3c4a4..6e882e8e 100644
--- a/docs/html/Makefile.am
+++ b/docs/html/Makefile.am
@@ -24,3 +24,5 @@ EXTRA_DIST = $(HTML_FILES)
 clean-local:
 	rm -f *~
 
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/html/img/Makefile.am b/docs/html/img/Makefile.am
index 05959954..c71a06bc 100644
--- a/docs/html/img/Makefile.am
+++ b/docs/html/img/Makefile.am
@@ -95,3 +95,5 @@ EXTRA_DIST = $(IMAGE_FILES)
 clean-local:
 	rm -f *~
 
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/html/img/thumbnails/.gitignore b/docs/html/img/thumbnails/.gitignore
deleted file mode 100644
index 8b137891..00000000
--- a/docs/html/img/thumbnails/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/docs/html/img/thumbnails/Makefile.am b/docs/html/img/thumbnails/Makefile.am
index 53ac8fc7..a04e2879 100644
--- a/docs/html/img/thumbnails/Makefile.am
+++ b/docs/html/img/thumbnails/Makefile.am
@@ -58,3 +58,5 @@ clean-local:
 	rm -f *~
 
 
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/html/videos/Makefile.am b/docs/html/videos/Makefile.am
index 94738d2c..7553b7ea 100644
--- a/docs/html/videos/Makefile.am
+++ b/docs/html/videos/Makefile.am
@@ -13,3 +13,5 @@ EXTRA_DIST = 					\
 clean-local:
 	rm -f *~
 
+
+-include $(top_srcdir)/git.mk