"make maintainer-clean" cleans up everything that "make distclean" does;

there's no need for files in DISTCLEANFILES to be in
MAINTAINERCLEANFILES as well.

In epan, split the generated source files into those that should be
cleaned by "make distclean" and those that shouldn't, and have
DISTCLEANFILES include only the ones that should be cleaned by "make
distclean" and have MAINTAINERCLEANFILES include the ones that shouldn't
be cleaned by "make distclean".  This should fix bug 1595.

The generated source files don't need to be in EXTRA_DIST.

Use LIBWIRESHARK_DISTCLEAN_GENERATED_SRC and
LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC in epan/Makefile.nmake.

svn path=/trunk/; revision=21882

4 files changed, 25 insertions, 15 deletions

diff --git a/epan/Makefile.am b/epan/Makefile.am
index adcd3ea03c..200a300767 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -77,7 +77,6 @@ EXTRA_libwireshark_la_SOURCES =	\
 EXTRA_DIST = \
 	dtd_grammar.lemon 	\
 	dtd_parse.l 		\
-	dtd_parse.c 		\
 	dtd_parse.h 		\
 	dtd_preparse.l 		\
 	enterprise-numbers  	\
@@ -100,16 +99,15 @@ CLEANFILES = \
 	*~
 
 DISTCLEANFILES = \
-	$(LIBWIRESHARK_GENERATED_SRC) \
+	$(LIBWIRESHARK_DISTCLEAN_GENERATED_SRC) \
 	dtd_grammar.h 		\
 	dtd_grammar.out
-	
 
 MAINTAINERCLEANFILES = \
+	$(LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC) \
 	Makefile.in		\
 	sminmpec.c
 
-
 #
 # Add the object files for missing routines, if any.
 #
@@ -212,4 +210,3 @@ doxygen:
 if HAVE_DOXYGEN
 	$(DOXYGEN) doxygen.cfg
 endif		# HAVE_DOXYGEN
-
diff --git a/epan/Makefile.common b/epan/Makefile.common
index 063b9a5da1..9d226bbd4a 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -92,13 +92,30 @@ LIBWIRESHARK_SRC = 		\
 	xdlc.c			\
 	xmlstub.c
 
-LIBWIRESHARK_GENERATED_SRC = 	\
-	dtd_grammar.c 		\
+#
+# These get removed on "make distclean", as the tools we use to generate
+# them are part of the Wireshark distribution.
+#
+LIBWIRESHARK_DISTCLEAN_GENERATED_SRC = \
+	dtd_grammar.c
+
+#
+# These don't get removed on "make distclean", as the tools we use to
+# generate them aren't part of the Wireshark distribution, and aren't
+# tools assumed to be present for any system capable of compiling
+# from a tarball (e.g., make and a C compiler are assumed to be present,
+# but Flex isn't).
+#
+LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC = \
 	dtd_parse.c 		\
 	dtd_preparse.c 		\
 	radius_dict.c 		\
 	uat_load.c
 
+LIBWIRESHARK_GENERATED_SRC = 	\
+	$(LIBWIRESHARK_DISTCLEAN_GENERATED_SRC) \
+	$(LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC)
+
 LIBWIRESHARK_ALL_SRC = \
 	$(LIBWIRESHARK_SRC) 	\
 	$(LIBWIRESHARK_GENERATED_SRC)
@@ -206,5 +223,3 @@ LIBWIRESHARK_INCLUDES = 	\
 	x264_prt_id.h		\
 	xdlc.h			\
 	xmlstub.h
-
-
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 4463d78009..26f36526bb 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -127,9 +127,10 @@ clean:
 # the same for now.
 #
 distclean: clean
-	rm -f config.h register.c mkstemp.c strptime.c radius_dict.c \
-		dtd_grammar.out	dtd_grammar.c dtd_grammar.h dtd_parse.c \
-		dtd_preparse.c sminmpec.c uat_load.c
+	rm -f config.h register.c mkstemp.c strptime.c \
+		$(LIBWIRESHARK_DISTCLEAN_GENERATED_SRC) \
+		$(LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC) \
+		dtd_grammar.out	dtd_grammar.h sminmpec.c 
 	cd crypt
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ../ftypes
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index 08a9811f37..23fdcb804d 100644
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -41,9 +41,6 @@ DISTCLEANFILES = \
 
 MAINTAINERCLEANFILES = \
 	Makefile.in	\
-	grammar.c	\
-	grammar.h	\
-	grammar.out	\
 	scanner.c
 
 INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/$(LEMON)