Give every Makefile.nmake file a "distclean" rule, and have "distclean"

recurse into subdirectories doing "nmake -f Makefile.nmake distclean".

Have "nmake -f Makefile.nmake clean" not remove stuff that "make clean"
doesn't remove (such as Flex/Bison output and config.h files) - and have
"nmake -f Makefile.nmake distclean" remove stuff that "make distclean"
removes, including "tethereal-tap-register.c" and
"ethereal-tap-register.c".

svn path=/trunk/; revision=8672

21 files changed, 114 insertions, 34 deletions

diff --git a/Makefile.nmake b/Makefile.nmake
index c669f3694e..c3b8bcdc99 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.346 2003/10/10 21:16:23 guy Exp $
+# $Id: Makefile.nmake,v 1.347 2003/10/10 21:31:46 guy Exp $
 
 include config.nmake
 include <win32.mak>
@@ -668,8 +668,8 @@ clean:
 	rm -f $(ethereal_OBJECTS) $(tethereal_OBJECTS) $(EXTRA_OBJECTS) \
 		$(EXECUTABLES) $(PDB_FILE) \
 		editcap.obj mergecap.obj text2pcap.obj \
-		text2pcap-scanner.obj text2pcap-scanner.c register.c \
-		rdps.obj rdps.pdb config.h ps.c \
+		text2pcap-scanner.obj text2pcap-scanner.c rdps.obj \
+		rdps.pdb config.h ps.c \
 		rdps.exe rdps.ilk dftest.obj dftest.exe randpkt.obj randpkt.ext \
 		$(RESOURCES)
 	cd wiretap
@@ -693,7 +693,25 @@ clean:
 # Call distclean only, if you would like to remove ALL generated files.
 # Be sure to have python and perl installed to regenerate them.
 distclean: clean
-	rm -f x11-declarations.h x11-register-info.h packet-ncp2222.c
+	rm -f x11-declarations.h x11-register-info.h packet-ncp2222.c \
+		register.c tethereal-tap-register.c 
+	cd wiretap
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../gtk
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../epan
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../plugins
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../tools
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../image
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../doc
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../packaging/nsis
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../..
 
 tools::
 	cd tools
diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake
index a023e39910..7df2ed0a14 100644
--- a/doc/Makefile.nmake
+++ b/doc/Makefile.nmake
@@ -1,7 +1,7 @@
 # Makefile.nmake
 # Nmake file for Ethereal documentation
 #
-# $Id: Makefile.nmake,v 1.10 2003/10/02 22:28:04 gerald Exp $
+# $Id: Makefile.nmake,v 1.11 2003/10/10 21:31:46 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -130,3 +130,5 @@ clean:
 	rm -f mergecap.html mergecap.1
 	rm -f text2pcap.html text2pcap.1
 	rm -f pod2htm*
+
+distclean: clean
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 6e0e0fec58..9c8fa59ad4 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.29 2003/06/15 23:04:47 guy Exp $
+# $Id: Makefile.nmake,v 1.30 2003/10/10 21:31:47 guy Exp $
 
 include ..\config.nmake
 
@@ -59,12 +59,18 @@ config.h	: config.h.win32 ..\config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ -e "s;@HAVE_GNU_ADNS@;$(ADNS_CONFIG);" < config.h.win32 > $@
 
 clean:
-	rm -f $(OBJECTS) ethereal.lib config.h $(PDB_FILE)
+	rm -f $(OBJECTS) ethereal.lib $(PDB_FILE)
 	cd ftypes
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../dfilter
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 
+distclean: clean
+	rm -f config.h
+	cd ftypes
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../dfilter
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 
 ftypes:: config.h
 	cd ftypes
diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index a0e927b4bb..835055c0a7 100644
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.9 2003/06/14 20:35:56 guy Exp $
+# $Id: Makefile.nmake,v 1.10 2003/10/10 21:31:47 guy Exp $
 
 include ..\..\config.nmake
 
@@ -45,8 +45,10 @@ $(OBJECTS): ..\config.h
 	cd dfilter
 
 clean:
-	rm -f $(OBJECTS) scanner.c grammar.c grammar.h grammar.out \
-	dfilter.lib $(PDB_FILE)
+	rm -f $(OBJECTS) dfilter.lib $(PDB_FILE)
+
+distclean: clean
+	rm -f scanner.c grammar.c grammar.h grammar.out
 
 scanner.c : scanner.l
 	$(LEX) -Pdf_ -oscanner.c scanner.l
@@ -61,5 +63,3 @@ $(LEMON)\lemon.exe:
 	cd ../../tools/lemon
 	$(MAKE) -f makefile.nmake
 	cd ../../epan/dfilter
-
-
diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake
index 8099cd7ec4..6ad6e5df23 100644
--- a/epan/ftypes/Makefile.nmake
+++ b/epan/ftypes/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.5 2003/06/14 20:35:57 guy Exp $
+# $Id: Makefile.nmake,v 1.6 2003/10/10 21:31:47 guy Exp $
 
 include ..\..\config.nmake
 
@@ -35,3 +35,4 @@ ftypes.lib	: $(OBJECTS)
 clean:
 	rm -f $(OBJECTS) ftypes.lib $(PDB_FILE)
 
+distclean: clean
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index 878eabcefb..c72fa375da 100644
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.53 2003/09/24 07:48:11 guy Exp $
+# $Id: Makefile.nmake,v 1.54 2003/10/10 21:31:48 guy Exp $
 
 include ..\config.nmake
 
@@ -106,3 +106,6 @@ ethereal-tap-register.c: $(ETHEREAL_TAP_SRC) ../make-tapreg-dotc
 
 clean:
 	rm -f $(OBJECTS) libui.lib $(PDB_FILE)
+
+distclean: clean
+	rm -f ethereal-tap-register.c
diff --git a/image/Makefile.nmake b/image/Makefile.nmake
index ba7ef43df0..2732c5326f 100644
--- a/image/Makefile.nmake
+++ b/image/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.5 2003/03/26 20:17:42 guy Exp $
+# $Id: Makefile.nmake,v 1.6 2003/10/10 21:31:48 guy Exp $
 #
 
 include ..\config.nmake
@@ -34,3 +34,5 @@ text2pcap.rc  : text2pcap.rc.in ..\config.nmake
 
 clean :
 	rm -f $(ALL_RC)
+
+distclean: clean
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 74ac7e456a..6f76327416 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.21 2003/10/02 22:28:04 gerald Exp $
+# $Id: Makefile.nmake,v 1.22 2003/10/10 21:31:49 guy Exp $
 #
 # NSIS is a free packager/installer/uninstaller program for Win32.
 # It was originally written for the Winamp package, but various
@@ -49,6 +49,8 @@ ethereal-setup-$(VERSION).exe : ethereal.nsi $(DELIVERABLES)
 clean:
 	rm -f ethereal-setup-$(VERSION).exe
 
+distclean: clean
+
 $(DOC):
 	cd ../../doc
 	$(MAKE) -f makefile.nmake
@@ -58,4 +60,3 @@ $(EXE) $(DLL):
 	cd ../..
 	$(MAKE) -f makefile.nmake
 	cd packaging/nsis
-
diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index 722a338c66..1d48209e2f 100644
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.24 2003/08/19 02:16:26 guy Exp $
+# $Id: Makefile.nmake,v 1.25 2003/10/10 21:31:49 guy Exp $
 #
 
 include ..\config.nmake
@@ -90,3 +90,25 @@ clean:
 	cd ../rtnet
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ..
+
+distclean: clean
+	cd artnet
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../docsis
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../giop
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../gryphon
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../lwres
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../megaco
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../mgcp
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../pcli
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../rtnet
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ..
+
diff --git a/plugins/artnet/Makefile.nmake b/plugins/artnet/Makefile.nmake
index 87e3234f86..511224c9ef 100644
--- a/plugins/artnet/Makefile.nmake
+++ b/plugins/artnet/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.3 2003/06/14 20:45:24 guy Exp $
+# $Id: Makefile.nmake,v 1.4 2003/10/10 21:31:49 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -17,3 +17,5 @@ artnet.dll artnet.exp artnet.lib : packet-artnet.obj ..\plugin_api.obj
 
 clean:
 	rm -f $(OBJECTS) artnet.dll artnet.exp artnet.lib $(PDB_FILE)
+
+distclean: clean
diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake
index 3dcee86126..c072574136 100644
--- a/plugins/docsis/Makefile.nmake
+++ b/plugins/docsis/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.5 2003/06/14 20:45:24 guy Exp $
+# $Id: Makefile.nmake,v 1.6 2003/10/10 21:31:49 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -40,3 +40,5 @@ docsis.dll docsis.exp docsis.lib : packet-docsis.obj packet-bpkmattr.obj packet-
 
 clean:
 	rm -f $(OBJECTS) docsis.dll docsis.exp docsis.lib $(PDB_FILE)
+
+distclean: clean
diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake
index 10c178b28e..dc652335f0 100644
--- a/plugins/giop/Makefile.nmake
+++ b/plugins/giop/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.8 2003/06/14 20:45:25 guy Exp $
+# $Id: Makefile.nmake,v 1.9 2003/10/10 21:31:50 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -23,4 +23,6 @@ coseventcomm.dll coseventcomm.exp coseventcomm.lib : packet-coseventcomm.obj ..\
 
 clean:
 	rm -f $(OBJECTS) cosnaming.dll cosnaming.exp cosnaming.lib \
-	coseventcomm.dll coseventcomm.exp coseventcomm.lib $(PDB_FILE)
+		coseventcomm.dll coseventcomm.exp coseventcomm.lib $(PDB_FILE)
+
+distclean: clean
diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index dffad3eca1..3cd9e4c77d 100644
--- a/plugins/gryphon/Makefile.nmake
+++ b/plugins/gryphon/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.11 2003/06/14 20:45:25 guy Exp $
+# $Id: Makefile.nmake,v 1.12 2003/10/10 21:31:50 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -17,3 +17,5 @@ gryphon.dll gryphon.exp gryphon.lib : packet-gryphon.obj ..\plugin_api.obj
 
 clean:
 	rm -f $(OBJECTS) gryphon.dll gryphon.exp gryphon.lib $(PDB_FILE)
+
+distclean: clean
diff --git a/plugins/lwres/Makefile.nmake b/plugins/lwres/Makefile.nmake
index 6f54b809e8..58b82f4ce2 100644
--- a/plugins/lwres/Makefile.nmake
+++ b/plugins/lwres/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.2 2003/08/05 17:09:54 guy Exp $
+# $Id: Makefile.nmake,v 1.3 2003/10/10 21:31:50 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -17,3 +17,5 @@ lwres.dll lwres.exp lwres.lib : packet-lwres.obj ..\plugin_api.obj
 
 clean:
 	rm -f $(OBJECTS) lwres.dll lwres.exp lwres.lib $(PDB_FILE)
+
+distclean: clean
diff --git a/plugins/megaco/Makefile.nmake b/plugins/megaco/Makefile.nmake
index ee27b2aff6..553fe7e858 100644
--- a/plugins/megaco/Makefile.nmake
+++ b/plugins/megaco/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.3 2003/06/14 20:45:26 guy Exp $
+# $Id: Makefile.nmake,v 1.4 2003/10/10 21:31:51 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -17,3 +17,5 @@ megaco.dll megaco.exp megaco.lib : packet-megaco.obj ..\plugin_api.obj
 
 clean:
 	rm -f $(OBJECTS) megaco.dll megaco.exp megaco.lib $(PDB_FILE)
+
+distclean: clean
diff --git a/plugins/mgcp/Makefile.nmake b/plugins/mgcp/Makefile.nmake
index 3d7bdfb75d..16687e653a 100644
--- a/plugins/mgcp/Makefile.nmake
+++ b/plugins/mgcp/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.7 2003/06/14 20:45:27 guy Exp $
+# $Id: Makefile.nmake,v 1.8 2003/10/10 21:31:51 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -17,3 +17,5 @@ mgcp.dll mgcp.exp mgcp.lib : packet-mgcp.obj ..\plugin_api.obj
 
 clean:
 	rm -f $(OBJECTS) mgcp.dll mgcp.exp mgcp.lib $(PDB_FILE)
+
+distclean: clean
diff --git a/plugins/pcli/Makefile.nmake b/plugins/pcli/Makefile.nmake
index 4c08249018..1c31060d6f 100644
--- a/plugins/pcli/Makefile.nmake
+++ b/plugins/pcli/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.3 2003/06/14 20:45:28 guy Exp $
+# $Id: Makefile.nmake,v 1.4 2003/10/10 21:31:52 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -17,3 +17,5 @@ pcli.dll pcli.exp pcli.lib : packet-pcli.obj ..\plugin_api.obj
 
 clean:
 	rm -f $(OBJECTS) pcli.dll pcli.exp pcli.lib $(PDB_FILE)
+
+distclean: clean
diff --git a/plugins/rtnet/Makefile.nmake b/plugins/rtnet/Makefile.nmake
index 4f3975e1f0..ee6a518490 100644
--- a/plugins/rtnet/Makefile.nmake
+++ b/plugins/rtnet/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.4 2003/06/14 20:45:29 guy Exp $
+# $Id: Makefile.nmake,v 1.5 2003/10/10 21:31:52 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -17,3 +17,5 @@ rtnet.dll rtnet.exp rtnet.lib : packet-rtnet.obj ..\plugin_api.obj
 
 clean:
 	rm -f $(OBJECTS) rtnet.dll rtnet.exp rtnet.lib $(PDB_FILE)
+
+distclean: clean
diff --git a/tools/Makefile.nmake b/tools/Makefile.nmake
index 6e1585d80a..55055337a0 100755
--- a/tools/Makefile.nmake
+++ b/tools/Makefile.nmake
@@ -1,15 +1,17 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.3 2002/02/27 09:42:49 guy Exp $
+# $Id: Makefile.nmake,v 1.4 2003/10/10 21:31:53 guy Exp $
 
 all: lemon
 
-
 clean:
 	cd lemon
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 
+distclean: clean
+	cd lemon
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 
 lemon::
 	cd lemon
diff --git a/tools/lemon/Makefile.nmake b/tools/lemon/Makefile.nmake
index 2f098dfa93..ed61d9776a 100644
--- a/tools/lemon/Makefile.nmake
+++ b/tools/lemon/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.8 2002/02/27 09:42:51 guy Exp $
+# $Id: Makefile.nmake,v 1.9 2003/10/10 21:31:53 guy Exp $
 
 include ..\..\config.nmake
 
@@ -14,3 +14,5 @@ all : lemon.exe
 
 clean:
 	rm -f lemon.obj lemon.exe lemon.ilk $(PDB_FILE) lemon.pdb
+
+distclean: clean
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index 952841fe26..2555798b7d 100644
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.34 2003/08/26 07:10:38 guy Exp $
+# $Id: Makefile.nmake,v 1.35 2003/10/10 21:31:53 guy Exp $
 #
 
 include ..\config.nmake
@@ -74,8 +74,11 @@ config.h	: config.h.win32
 	sed -e s/@VERSION@/$(WTAP_VERSION)/ < config.h.win32 > $@
 
 clean :
-	rm -f $(OBJECTS) ascend-grammar.c ascend-grammar.h ascend-scanner.c \
+	rm -f $(OBJECTS) \
 		wiretap-$(WTAP_VERSION).lib \
 		wiretap-$(WTAP_VERSION).exp \
 		wiretap-$(WTAP_VERSION).dll \
-		config.h $(PDB_FILE)
+		$(PDB_FILE)
+
+distclean: clean
+	rm -f config.h ascend-grammar.c ascend-grammar.h ascend-scanner.c