From 6ea3d47e776871efd168b93ada2b6bcdad7a789e Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 22 May 2007 07:21:12 +0000 Subject: "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 --- epan/Makefile.common | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'epan/Makefile.common') 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 - - -- cgit v1.2.3