3 files changed, 28 insertions, 18 deletions
diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index 84c9b7513c..12a7a8f17b 100644
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -105,13 +105,11 @@ register.c: $(plugin_src) $(DISSECTOR_SRC) $(srcdir)/make-reg-dotc $(srcdir)/mak
 #dist-hook:
 #	@rm -f $(distdir)/register.c
 
-
-MAINTAINERCLEANFILES =	\
-	register.c	\
-	packet-ncp2222.c
-
 CLEANFILES = \
 	libdissectors.a		\
 	libdissectors.la	\
 	$(GENERATED_HEADER_FILES)	\
 	*~
+
+MAINTAINERCLEANFILES =	\
+	$(GENERATED_FILES)
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 284f0b61fd..e486490dd0 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -23,13 +23,28 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#
-# Generated header files that we want in the distribution.
-#
-GENERATED_HEADER_FILES = \
+# "BUILT_SOURCES" are built before any "make all" or "make check" targets.
+BUILT_HEADER_FILES = \
 	x11-declarations.h	\
 	x11-register-info.h
 
+BUILT_C_FILES = \
+	register.c
+
+BUILT_SOURCES =	$(BUILT_C_FILES) $(BUILT_HEADER_FILES)
+
+# Header files generated from source files.
+GENERATED_HEADER_FILES = \
+	$(BUILT_HEADER_FILES)
+
+# C source files generated from source files.
+GENERATED_C_FILES = \
+	$(BUILT_C_FILES)	\
+	packet-ncp2222.c
+
+# All the generated files.
+GENERATED_FILES = $(GENERATED_HEADER_FILES) $(GENERATED_C_FILES)
+
 # the dissector sources (without any helpers)
 DISSECTOR_SRC =	\
 	packet-3g-a11.c	\
@@ -791,17 +806,13 @@ DISSECTOR_INCLUDES =	\
 	packet-ypxfr.h	\
 	$(GENERATED_HEADER_FILES)
 
-# dissector helpers (needed from the dissectors, but not a dissector itself)
+# Dissector helpers.  They're included in the source files in this
+# directory, but they're not dissectors themselves, i.e. they're not
+# used to generate "register.c").
 DISSECTOR_SUPPORT_SRC =	\
 	packet-dcerpc-nt.c	\
 	register.c
 
-# "BUILT_SOURCES" are built before any "make all" or "make check" targets.
-BUILT_SOURCES =		\
-	register.c	\
-	x11-declarations.h	\
-	x11-register-info.h
-
 # this target needed for distribution only
 noinst_HEADERS =	\
 	$(DISSECTOR_INCLUDES)
diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake
index 28dd4562c3..d606401ad9 100644
--- a/epan/dissectors/Makefile.nmake
+++ b/epan/dissectors/Makefile.nmake
@@ -39,7 +39,6 @@ packet-x11.obj	: packet-x11.c x11-declarations.h x11-register-info.h
 x11-declarations.h x11-register-info.h: x11-fields process-x11-fields.pl
 	$(PERL) process-x11-fields.pl <x11-fields
 
-
 #
 # Build "register.c", which contains a function "register_all_protocols()"
 # that calls the register routines for all protocols.
@@ -98,4 +97,6 @@ clean:
 		$(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
 
 distclean: clean
-	rm -f $(BUILT_SOURCES) packet-ncp2222.c register.c
+
+maintainer-clean: distclean
+	rm -f $(GENERATED_FILES)