After doing "make maintainer-clean", "svn status --no-ignore | grep ^I"

returned quite a list of files. Add them to MAINTAINERCLEANFILES.

Whitespace changes (replace multiple spaces by TABs, in a few cases this
needed to be done at the beginning of Makefile lines.


svn path=/trunk/; revision=14891

41 files changed, 236 insertions, 81 deletions

diff --git a/Makefile.am b/Makefile.am
index 16f6c4b471..26d19db010 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -360,11 +360,19 @@ DISTCLEANFILES = \
 	ps.c
 
 MAINTAINERCLEANFILES =		\
-	$(GENERATED_FILES)
+	$(GENERATED_FILES)	\
+	Makefile.in		\
+	aclocal.m4		\
+	config.h.in		\
+	configure		\
+	depcomp			\
+	install-sh		\
+	ltmain.sh		\
+	missing
 
 EXTRA_DIST = \
 	FAQ			\
-	INSTALL.configure       \
+	INSTALL.configure	\
 	Makefile.common		\
 	Makefile.nmake		\
 	README.aix		\
@@ -387,7 +395,7 @@ EXTRA_DIST = \
 	capture-wpcap.h		\
 	capture_wpcap_packet.c  \
 	capture_wpcap_packet.h  \
-	cfilters 			\
+	cfilters 		\
 	cleanbld.bat		\
 	colorfilters 		\
 	config.h.win32		\
@@ -402,16 +410,16 @@ EXTRA_DIST = \
 	debian/postinst		\
 	debian/prerm		\
 	debian/rules		\
-	dfilters 			\
+	dfilters 		\
 	dictionary.dtd		\
 	dictionary.xml		\
-	doc/Makefile.am         \
-	doc/Makefile.nmake      \
-	doc/README.capture      \
-	doc/README.design       \
-	doc/README.developer    \
-	doc/README.idl2eth      \
-	doc/README.plugins      \
+	doc/Makefile.am		\
+	doc/Makefile.nmake	\
+	doc/README.capture	\
+	doc/README.design	\
+	doc/README.developer	\
+	doc/README.idl2eth	\
+	doc/README.plugins	\
 	doc/README.regression   \
 	doc/README.tapping	\
 	doc/README.tvbuff	\
@@ -532,19 +540,19 @@ EXTRA_DIST = \
 	make-manuf		\
 	make-tapreg-dotc	\
 	make-version.pl		\
-	manuf                   \
+	manuf			\
 	manuf.tmpl		\
 	mergecap.c		\
 	mobileipv4.xml		\
 	nasreq.xml		\
 	perlnoutf.pl		\
-	print.ps                \
+	print.ps		\
 	randpkt.c		\
 	rdps.c			\
 	sunping.xml		\
-	text2pcap-scanner.l     \
-	text2pcap.c             \
-	text2pcap.h             \
+	text2pcap-scanner.l	\
+	text2pcap.c		\
+	text2pcap.h		\
 	wka.tmpl
 
 if SETUID_INSTALL
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ec1dcd6463..ebe49fe5da 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,103 +28,103 @@ ethereal-tmp.pod: $(srcdir)/ethereal.pod $(top_builddir)/AUTHORS-SHORT-FORMAT
 	cat $(srcdir)/ethereal.pod $(top_builddir)/AUTHORS-SHORT-FORMAT > ethereal-tmp.pod
 
 ../ethereal.1: ethereal-tmp.pod ../config.h
-	$(POD2MAN)                     \
-	--center="The Ethereal Network Analyzer" \
-	--release=$(VERSION)			 \
+	$(POD2MAN)					\
+	--center="The Ethereal Network Analyzer"	\
+	--release=$(VERSION)				\
 	ethereal-tmp.pod | sed 's/ETHEREAL-TMP/ETHEREAL/' > ../ethereal.1
 
 ../ethereal.html: ethereal-tmp.pod ../config.h
-	$(POD2HTML)                    \
-	--title="The Ethereal Network Analyzer $(VERSION)" \
-	--noindex                                 \
+	$(POD2HTML)						\
+	--title="The Ethereal Network Analyzer $(VERSION)"	\
+	--noindex						\
 	ethereal-tmp.pod > ../ethereal.html
 
 ../tethereal.1: tethereal.pod ../config.h
-	$(POD2MAN)                     \
-	--center="The Ethereal Network Analyzer" \
-	--release=$(VERSION)			 \
+	$(POD2MAN)					\
+	--center="The Ethereal Network Analyzer"	\
+	--release=$(VERSION)				\
 	$(srcdir)/tethereal.pod > ../tethereal.1
 
 ../tethereal.html: tethereal.pod ../config.h
-	$(POD2HTML)                    \
-	--title="tethereal - The Ethereal Network Analyzer $(VERSION)" \
-	--noindex                                 \
+	$(POD2HTML)							\
+	--title="tethereal - The Ethereal Network Analyzer $(VERSION)"	\
+	--noindex							\
 	$(srcdir)/tethereal.pod > ../tethereal.html
 
 ../ethereal-filter.4: ethereal-filter.pod ../config.h
-	$(POD2MAN)                     \
-	--section=4 \
-	--center="The Ethereal Network Analyzer" \
-	--release=$(VERSION)			 \
+	$(POD2MAN)					\
+	--section=4					\
+	--center="The Ethereal Network Analyzer"	\
+	--release=$(VERSION)				\
 	ethereal-filter.pod > ../ethereal-filter.4
 
 ../ethereal-filter.html: ethereal-filter.pod ../config.h
-	$(POD2HTML)                    \
-	--title="ethereal-filter - The Ethereal Network Analyzer $(VERSION)" \
-	--noindex                                 \
+	$(POD2HTML)								\
+	--title="ethereal-filter - The Ethereal Network Analyzer $(VERSION)"	\
+	--noindex								\
 	ethereal-filter.pod > ../ethereal-filter.html
 
 ethereal-filter.pod: ethereal-filter.pod.template  ../tethereal
 	../tethereal -G fields | $(PERL) $(srcdir)/dfilter2pod.pl $(srcdir)/ethereal-filter.pod.template > ethereal-filter.pod
 
 ../capinfos.1: capinfos.pod ../config.h
-	$(POD2MAN)                      \
-	--center="The Ethereal Network Analyzer" \
-	--release=$(VERSION)			 \
+	$(POD2MAN)					\
+	--center="The Ethereal Network Analyzer"	\
+	--release=$(VERSION)				\
 	$(srcdir)/capinfos.pod > ../capinfos.1
 
 ../capinfos.html: capinfos.pod ../config.h
-	$(POD2HTML)                     \
-	--title="capinfos - The Ethereal Network Analyzer $(VERSION)" \
-	--noindex                                 \
+	$(POD2HTML)							\
+	--title="capinfos - The Ethereal Network Analyzer $(VERSION)"	\
+	--noindex							\
 	$(srcdir)/capinfos.pod > ../capinfos.html
 
 ../editcap.1: editcap.pod ../config.h
-	$(POD2MAN)                      \
-	--center="The Ethereal Network Analyzer" \
-	--release=$(VERSION)			 \
+	$(POD2MAN)					\
+	--center="The Ethereal Network Analyzer"	\
+	--release=$(VERSION)				\
 	$(srcdir)/editcap.pod > ../editcap.1
 
 ../editcap.html: editcap.pod ../config.h
-	$(POD2HTML)                     \
-	--title="editcap - The Ethereal Network Analyzer $(VERSION)" \
-	--noindex                                 \
+	$(POD2HTML)							\
+	--title="editcap - The Ethereal Network Analyzer $(VERSION)"	\
+	--noindex							\
 	$(srcdir)/editcap.pod > ../editcap.html
 
 ../idl2eth.1: idl2eth.pod ../config.h
-	$(POD2MAN)                      \
-	--center="The Ethereal Network Analyzer" \
-	--release=$(VERSION)			 \
+	$(POD2MAN)					\
+	--center="The Ethereal Network Analyzer"	\
+	--release=$(VERSION)				\
 	$(srcdir)/idl2eth.pod > ../idl2eth.1
 
 ../idl2eth.html: idl2eth.pod ../config.h
-	$(POD2HTML)                     \
-	--title="idl2eth - The Ethereal Network Analyzer $(VERSION)" \
-	--noindex                                 \
+	$(POD2HTML)							\
+	--title="idl2eth - The Ethereal Network Analyzer $(VERSION)"	\
+	--noindex							\
 	$(srcdir)/idl2eth.pod > ../idl2eth.html
 
 ../mergecap.1: mergecap.pod ../config.h
-	$(POD2MAN)                      \
-	--center="The Ethereal Network Analyzer" \
-	--release=$(VERSION)			 \
+	$(POD2MAN)					\
+	--center="The Ethereal Network Analyzer"	\
+	--release=$(VERSION)				\
 	$(srcdir)/mergecap.pod > ../mergecap.1
 
 ../mergecap.html: mergecap.pod ../config.h
-	$(POD2HTML)                     \
-	--title="mergecap - The Ethereal Network Analyzer $(VERSION)" \
-	--noindex                                 \
+	$(POD2HTML)							\
+	--title="mergecap - The Ethereal Network Analyzer $(VERSION)"	\
+	--noindex							\
 	$(srcdir)/mergecap.pod > ../mergecap.html
 
 ../text2pcap.1: text2pcap.pod ../config.h
-	$(POD2MAN)                      \
-	--center="The Ethereal Network Analyzer" \
-	--release=$(VERSION)			 \
+	$(POD2MAN)					\
+	--center="The Ethereal Network Analyzer"	\
+	--release=$(VERSION)				\
 	$(srcdir)/text2pcap.pod > ../text2pcap.1
 
 ../text2pcap.html: text2pcap.pod ../config.h
 	$(POD2HTML)                     \
-	--title="text2pcap - The Ethereal Network Analyzer $(VERSION)" \
-	--noindex                                 \
+	--title="text2pcap - The Ethereal Network Analyzer $(VERSION)"	\
+	--noindex							\
 	$(srcdir)/text2pcap.pod > ../text2pcap.html
 
 CLEANFILES =		\
@@ -151,3 +151,7 @@ DISTCLEANFILES =	\
 	pod2htmi.tmp	\
 	pod2htmd.tmp	\
 	*~
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 04fc221af7..eabb90bf11 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -61,6 +61,9 @@ CLEANFILES = \
 	libethereal.la		\
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 #
 # Add the object files for missing routines, if any.
 #
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index dae7fe7a78..a46ec25aaa 100644
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -28,6 +28,13 @@ CLEANFILES = \
 	libdfilter.la		\
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in	\
+	grammar.c	\
+	grammar.h	\
+	grammar.out	\
+	scanner.c
+
 INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/$(LEMON)
 
 libdfilter_la_SOURCES = \
diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index 12a7a8f17b..033baf0021 100644
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -112,4 +112,5 @@ CLEANFILES = \
 	*~
 
 MAINTAINERCLEANFILES =	\
-	$(GENERATED_FILES)
+	$(GENERATED_FILES)	\
+	Makefile.in
diff --git a/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am
index 2c6893beb5..ba94e1c035 100644
--- a/epan/ftypes/Makefile.am
+++ b/epan/ftypes/Makefile.am
@@ -28,6 +28,9 @@ CLEANFILES = \
 	libftypes.la	\
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/..
 
 libftypes_la_SOURCES =	\
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 0806e37445..45b5db1905 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -29,8 +29,9 @@ CLEANFILES = \
 	libui.a		\
 	*~
 
-MAINTAINERCLEANFILES =		\
-	$(GENERATED_FILES)
+MAINTAINERCLEANFILES = \
+	$(GENERATED_FILES)	\
+	Makefile.in
 
 ethereal-tap-register.c: $(ETHEREAL_TAP_SRC) $(top_srcdir)/make-tapreg-dotc
 	@echo Making ethereal-tap-register.c
@@ -94,7 +95,7 @@ noinst_HEADERS = \
 	tap_dfilter_dlg.h \
 	tap_menu.h	\
 	text_page.h	\
-	toolbar.h       \
+	toolbar.h	\
 	ui_util.h	\
 	voip_calls.h	\
 	voip_calls_dlg.h \
diff --git a/help/Makefile.am b/help/Makefile.am
index 3c2c3f39dd..2c3b3fda5a 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -25,15 +25,19 @@
 # Install the help files in the "help" subdirectory of the data directory.
 #
 helpdir = $(pkgdatadir)/help
-help_DATA =            \
-	toc                 \
-	getting_started.txt \
-	capturing.txt       \
-	capture_filters.txt \
-	display_filters.txt \
-	faq.txt             \
+help_DATA = \
+	toc			\
+	getting_started.txt	\
+	capturing.txt		\
+	capture_filters.txt	\
+	display_filters.txt	\
+	faq.txt			\
 	overview.txt
 
 EXTRA_DIST = $(help_DATA) Makefile.nmake
 
 CLEANFILES = 
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
diff --git a/packaging/Makefile.am b/packaging/Makefile.am
index c4f367f9bc..5860a8b391 100644
--- a/packaging/Makefile.am
+++ b/packaging/Makefile.am
@@ -1 +1,5 @@
 SUBDIRS = rpm svr4 nsis
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am
index 5732da551b..73637ea6f1 100644
--- a/packaging/nsis/Makefile.am
+++ b/packaging/nsis/Makefile.am
@@ -1,3 +1,6 @@
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	ethereal.nsi	\
 	../../COPYING	\
diff --git a/packaging/rpm/Makefile.am b/packaging/rpm/Makefile.am
index 787d5848e8..0ebfb7f1b1 100644
--- a/packaging/rpm/Makefile.am
+++ b/packaging/rpm/Makefile.am
@@ -1,3 +1,7 @@
 SUBDIRS = SPECS
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 clean-local:
 	rm -rf BUILD RPMS SOURCES SRPMS
diff --git a/packaging/rpm/SPECS/Makefile.am b/packaging/rpm/SPECS/Makefile.am
index 28b04012e9..b72d5ce6c7 100644
--- a/packaging/rpm/SPECS/Makefile.am
+++ b/packaging/rpm/SPECS/Makefile.am
@@ -1 +1,4 @@
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = ethereal.spec.in
diff --git a/packaging/svr4/Makefile.am b/packaging/svr4/Makefile.am
index 127885e13d..baf92c1524 100644
--- a/packaging/svr4/Makefile.am
+++ b/packaging/svr4/Makefile.am
@@ -1,3 +1,7 @@
-DISTCLEANFILES = Prototype
+DISTCLEANFILES = \
+	Prototype
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
 
 EXTRA_DIST = checkinstall.in mkpkg pkginfo.in
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 0f69f323d8..5f824d0bee 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -53,3 +53,7 @@ plugindir = @plugindir@
 
 EXTRA_DIST = \
 	Makefile.nmake
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
diff --git a/plugins/acn/Makefile.am b/plugins/acn/Makefile.am
index 8df2be4ea0..09f5188b33 100644
--- a/plugins/acn/Makefile.am
+++ b/plugins/acn/Makefile.am
@@ -40,5 +40,8 @@ CLEANFILES = \
 	acn \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/agentx/Makefile.am b/plugins/agentx/Makefile.am
index fe4b1f2e3a..a9f37009a0 100644
--- a/plugins/agentx/Makefile.am
+++ b/plugins/agentx/Makefile.am
@@ -40,5 +40,8 @@ CLEANFILES = \
 	agentx \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/artnet/Makefile.am b/plugins/artnet/Makefile.am
index 8f090e6d6c..5307ebe2cc 100644
--- a/plugins/artnet/Makefile.am
+++ b/plugins/artnet/Makefile.am
@@ -40,5 +40,8 @@ CLEANFILES = \
 	artnet \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/asn1/Makefile.am b/plugins/asn1/Makefile.am
index 471c014e0c..acf26c42b8 100644
--- a/plugins/asn1/Makefile.am
+++ b/plugins/asn1/Makefile.am
@@ -36,6 +36,11 @@ asn1_la_LIBADD = @PLUGIN_LIBS@
 # add them here.
 LIBS = $(GLIB_LIBS)
 
-CLEANFILES = asn1 *~
+CLEANFILES = \
+	asn1	\
+	*~
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
 
 EXTRA_DIST = Makefile.nmake
diff --git a/plugins/ciscosm/Makefile.am b/plugins/ciscosm/Makefile.am
index 050db9e32b..47f756ada5 100644
--- a/plugins/ciscosm/Makefile.am
+++ b/plugins/ciscosm/Makefile.am
@@ -41,5 +41,8 @@ CLEANFILES = \
 	ciscosm \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am
index 067e97c416..ea91755def 100644
--- a/plugins/docsis/Makefile.am
+++ b/plugins/docsis/Makefile.am
@@ -40,6 +40,9 @@ CLEANFILES = \
 	docsis \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake \
 	README
diff --git a/plugins/enttec/Makefile.am b/plugins/enttec/Makefile.am
index 839615acae..5ee8c345d5 100644
--- a/plugins/enttec/Makefile.am
+++ b/plugins/enttec/Makefile.am
@@ -40,5 +40,8 @@ CLEANFILES = \
 	enttec \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/giop/Makefile.am b/plugins/giop/Makefile.am
index c0bcd17768..dc3d68f15b 100644
--- a/plugins/giop/Makefile.am
+++ b/plugins/giop/Makefile.am
@@ -54,9 +54,12 @@ LIBS =
 CLEANFILES = \
 	cosnaming \
 	coseventcomm \
-        tango \
+	tango \
 	parlay \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am
index ebc1b659b0..10e893f113 100644
--- a/plugins/gryphon/Makefile.am
+++ b/plugins/gryphon/Makefile.am
@@ -42,5 +42,8 @@ CLEANFILES = \
 	gryphon \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am
index d0a5b93be4..0b4c1bab07 100644
--- a/plugins/irda/Makefile.am
+++ b/plugins/irda/Makefile.am
@@ -41,5 +41,8 @@ CLEANFILES = \
 	irda \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/lwres/Makefile.am b/plugins/lwres/Makefile.am
index fd12536d17..6142029c8d 100644
--- a/plugins/lwres/Makefile.am
+++ b/plugins/lwres/Makefile.am
@@ -40,5 +40,8 @@ CLEANFILES = \
 	lwres \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am
index 266d308fa2..9e319d99e4 100644
--- a/plugins/mate/Makefile.am
+++ b/plugins/mate/Makefile.am
@@ -27,8 +27,20 @@ INCLUDES = -I$(top_srcdir)
 plugindir = @plugindir@
 
 plugin_LTLIBRARIES = mate.la
-mate_la_SOURCES = moduleinfo.h mate.h  mate_util.h mate_grammar.h \
-                  packet-mate.c mate_runtime.c mate_setup.c mate_util.c mate_plugin.c mate_grammar.c mate_parser.c
+
+mate_la_SOURCES = \
+	mate.h		\
+	mate_grammar.c	\
+	mate_grammar.h	\
+	mate_parser.c	\
+	mate_plugin.c	\
+	mate_runtime.c	\
+	mate_setup.c	\
+	mate_util.c	\
+	mate_util.h	\
+	moduleinfo.h	\
+	packet-mate.c
+
 mate_la_LDFLAGS = -module -avoid-version
 mate_la_LIBADD = @PLUGIN_LIBS@
 
@@ -41,6 +53,13 @@ CLEANFILES = \
 	mate \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in		\
+	mate_grammar.c		\
+	mate_grammar.h		\
+	mate_grammar.out	\
+	mate_parser.c
+
 EXTRA_DIST = \
 	mate_grammar.lemon \
 	mate_parser.l \
diff --git a/plugins/megaco/Makefile.am b/plugins/megaco/Makefile.am
index 9d4b288463..019fc1676d 100644
--- a/plugins/megaco/Makefile.am
+++ b/plugins/megaco/Makefile.am
@@ -40,5 +40,8 @@ CLEANFILES = \
 	megaco \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/mgcp/Makefile.am b/plugins/mgcp/Makefile.am
index 283f7c4ffa..ebbff9cd71 100644
--- a/plugins/mgcp/Makefile.am
+++ b/plugins/mgcp/Makefile.am
@@ -40,5 +40,8 @@ CLEANFILES = \
 	mgcp \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/opsi/Makefile.am b/plugins/opsi/Makefile.am
index 9fe462c238..0adcaf8b0a 100644
--- a/plugins/opsi/Makefile.am
+++ b/plugins/opsi/Makefile.am
@@ -40,5 +40,8 @@ CLEANFILES = \
 	opsi \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/pcli/Makefile.am b/plugins/pcli/Makefile.am
index 18af83bd73..1aa126be2c 100644
--- a/plugins/pcli/Makefile.am
+++ b/plugins/pcli/Makefile.am
@@ -40,5 +40,8 @@ CLEANFILES = \
 	pcli \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am
index 0f6a6f582f..7a162159ed 100644
--- a/plugins/profinet/Makefile.am
+++ b/plugins/profinet/Makefile.am
@@ -40,5 +40,8 @@ CLEANFILES = \
 	profinet \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/rdm/Makefile.am b/plugins/rdm/Makefile.am
index 85dd54b789..3ff02da81a 100644
--- a/plugins/rdm/Makefile.am
+++ b/plugins/rdm/Makefile.am
@@ -40,5 +40,8 @@ CLEANFILES = \
 	rdm \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/rlm/Makefile.am b/plugins/rlm/Makefile.am
index 56f26dc792..87eb3e8e2f 100644
--- a/plugins/rlm/Makefile.am
+++ b/plugins/rlm/Makefile.am
@@ -41,5 +41,8 @@ CLEANFILES = \
 	rlm \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/rtnet/Makefile.am b/plugins/rtnet/Makefile.am
index 0d3b36634b..71b1a54f30 100644
--- a/plugins/rtnet/Makefile.am
+++ b/plugins/rtnet/Makefile.am
@@ -40,5 +40,8 @@ CLEANFILES = \
 	rtnet \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/rudp/Makefile.am b/plugins/rudp/Makefile.am
index dbcbcde3ad..6625af01b0 100644
--- a/plugins/rudp/Makefile.am
+++ b/plugins/rudp/Makefile.am
@@ -41,5 +41,8 @@ CLEANFILES = \
 	rudp \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am
index 50a1301ed9..efe0a78fb3 100644
--- a/plugins/stats_tree/Makefile.am
+++ b/plugins/stats_tree/Makefile.am
@@ -40,5 +40,8 @@ CLEANFILES = \
 	stats_tree \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/v5ua/Makefile.am b/plugins/v5ua/Makefile.am
index abaf7e540b..89d433b572 100644
--- a/plugins/v5ua/Makefile.am
+++ b/plugins/v5ua/Makefile.am
@@ -40,5 +40,8 @@ CLEANFILES = \
 	v5ua \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake
diff --git a/plugins/xml/Makefile.am b/plugins/xml/Makefile.am
index 0f2acb748b..02a819a75d 100644
--- a/plugins/xml/Makefile.am
+++ b/plugins/xml/Makefile.am
@@ -47,6 +47,9 @@ CLEANFILES = \
 	xml \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 EXTRA_DIST = \
 	Makefile.nmake \
 	xml_lexer.l
diff --git a/tools/Makefile.am b/tools/Makefile.am
index aa61a6167e..a5d733d148 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -37,3 +37,7 @@ EXTRA_DIST = \
 	unix2dos.pl		\
 	win32-setup.sh		\
 	yacc.py
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
diff --git a/tools/lemon/Makefile.am b/tools/lemon/Makefile.am
index fc6d2f0810..8b2adb083b 100644
--- a/tools/lemon/Makefile.am
+++ b/tools/lemon/Makefile.am
@@ -31,6 +31,9 @@ noinst_PROGRAMS = lemon
 CLEANFILES = \
 	*~
 
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
 lemon_SOURCES = \
 	lemon.c
 
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 10be15d31d..558f80d772 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -33,7 +33,12 @@ CLEANFILES = \
 	libwiretap.la		\
 	*~
 
-MAINTAINERCLEANFILES = $(GENERATED_FILES)
+MAINTAINERCLEANFILES = \
+	$(GENERATED_FILES)	\
+	Makefile.in		\
+	aclocal.m4		\
+	config.h.in		\
+	configure
 
 libwiretap_la_SOURCES = \
 	$(NONGENERATED_C_FILES)	\