From 17de78b173d94b819cc8c6e2116d015689c19eea Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 6 Nov 2015 14:55:02 +0100
Subject: make: Improve distclean ruleset.

---
 Makefile.am         | 36 ++++++++++++++++++++++++++++++++++--
 example/Makefile.am |  2 ++
 src/Makefile.am     |  1 +
 tests/Makefile.am   |  1 +
 4 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 35d859f..7e02e2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+NULL=
 
 VER=3
 
@@ -14,8 +15,39 @@ SUBDIRS = src example tests
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libayatana-ido$(VER)-0.4.pc
 
-CLEANFILES = libayatana-ido-0.4.pc libayatana-ido3-0.4.pc
-DISTCLEANFILES = libayatana-ido.pc libayatana-ido3.pc
+CLEANFILES = \
+	libayatana-ido-0.4.pc \
+	libayatana-ido3-0.4.pc \
+	$(NULL)
+
+DISTCLEANFILES = \
+	libayatana-ido.pc \
+	libayatana-ido3.pc \
+	Makefile.in \
+	aclocal.m4 \
+	autom4te.cache/ \
+	compile \
+	config.guess \
+	config.h.in \
+	config.h.in~ \
+	config.sub \
+	configure \
+	depcomp \
+	gtk-doc.make \
+	install-sh \
+	ltmain.sh \
+	m4/gtk-doc.m4 \
+	m4/libtool.m4 \
+	m4/ltoptions.m4 \
+	m4/ltsugar.m4 \
+	m4/ltversion.m4 \
+	m4/lt~obsolete.m4 \
+	missing \
+	omf.make \
+	test-driver \
+	xmldocs.make \
+	$(NULL)
+
 EXTRA_DIST = libayatana-ido.pc.in libayatana-ido3.pc.in
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc
diff --git a/example/Makefile.am b/example/Makefile.am
index 1cefafe..1709835 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -29,3 +29,5 @@ menus_CPPFLAGS =                \
 messagedialog_LDADD = $(top_builddir)/src/libayatana-ido$(VER)-0.4.la $(GTK_LIBS)
 
 menus_LDADD = $(top_builddir)/src/libayatana-ido$(VER)-0.4.la $(GTK_LIBS)
+
+DISTCLEANFILES = Makefile.in
\ No newline at end of file
diff --git a/src/Makefile.am b/src/Makefile.am
index 6b22590..dd9c4cb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -124,6 +124,7 @@ libayatana_ido3_0_4_la_LDFLAGS =                \
 	$(libayatana_ido_0_4_la_LDFLAGS)
 
 DISTCLEANFILES =			\
+	Makefile.in			\
 	stamp-idotypebuiltins.h		\
 	idotypebuiltins.h		\
 	idotypebuiltins.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f3c035b..67047d5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -48,3 +48,4 @@ gtest_menuitems_LDADD = \
 	libgtest.a \
 	-lX11 -lXi
 
+DISTCLEANFILES = Makefile.in
-- 
cgit v1.2.3