From 6616a3770c6ba8f0154e9887f5179af59a8f4b2c Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 14 Feb 2005 20:33:57 +0000 Subject: Make the "maintainer-clean" rules get rid of some additional generated files. Do this with GENERATED_HEADER_FILES, GENERATED_C_FILES, and GENERATED_FILES macros in Makefile.common files, along the lines of what wiretap/Makefile.common has. Clean up "*~" files with "make clean" rather than only "make distclean" in some additional places. Add "maintainer-clean" rules to the Makefile.nmake files, paralelling the ones in the automake-generated Makefile.in files, using the GENERATED_FILES macros from Makefile.common files. In some cases, move the cleanup of files from "make distclean" to "make maintainer-clean", and in other cases, put in a comment indicating why we're not doing that (because some files that are distributed in the source tarballs, namely Flex output, were built with a UN*X Flex and won't compile on Windows, so we get rid of them with "make distclean" so you can clean up stuff that *has* to be re-generated for Windows). Clean up some *CLEANFILES definitions - get rid of ones that no longer apply as files were moved or that add to the definition a name that's already there. svn path=/trunk/; revision=13402 --- Makefile.nmake | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) (limited to 'Makefile.nmake') diff --git a/Makefile.nmake b/Makefile.nmake index 8c0f29f84e..fdde302340 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -27,9 +27,6 @@ PLATFORM_SRC = capture-wpcap.c include Makefile.common -BUILT_SOURCES = $(BUILT_SOURCES) \ - svnversion.h - ethereal_OBJECTS = $(ethereal_SOURCES:.c=.obj) tethereal_OBJECTS = $(tethereal_SOURCES:.c=.obj) dftest_OBJECTS = $(dftest_SOURCES:.c=.obj) @@ -290,11 +287,10 @@ clean: gtk2_distclean $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../.. -# Call distclean only, if you would like to remove ALL generated files. -# Be sure to have python and perl installed to regenerate them. +# "distclean" removes all files not part of the distribution. +# It does not remove generated files that are part of the distribution. distclean: clean gtk2_distclean - rm -f $(BUILT_SOURCES) \ - tethereal-tap-register.c + rm -f config.h $(BUILT_SOURCES) cd wiretap $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../gtk @@ -315,6 +311,31 @@ distclean: clean gtk2_distclean $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../.. +# Make "maintainer-clean" only if you would like to remove ALL generated +# files. +# Be sure to have python and perl installed to regenerate them. +maintainer-clean: distclean + rm -f $(GENERATED_FILES) + cd wiretap + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean + cd ../gtk + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean + cd ../epan + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean + cd ../plugins + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean + cd ../tools + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean + cd ../image + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean + cd ../doc + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean + cd ../help + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean + cd ../packaging/nsis + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean + cd ../.. + tools:: cd tools $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake @@ -490,4 +511,3 @@ update_plugin_api: config.h cd plugins $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake xyzzy cd .. - -- cgit v1.2.3