In doc/Makefile.nmake, use the "install-deps" target from the root

Makefile.nmake instead of doing our own XCOPYing.  Use the "clean-deps"
target when we're done instead of leaving DLLs lying around.

Normalize the use of underscores vs hyphens in the "clean-deps" target.

svn path=/trunk/; revision=15704

Makefile.nmake

@@ -523,7 +523,7 @@ clean_setup:
 # to the source tree, so you can run (t)ethereal directly from there.
 # Note that the gtk2 version of ethereal is called ethereal-gtk2.exe
 
-install-deps: clean_deps install-gtk1-deps install-gtk2-deps
+install-deps: clean-deps install-gtk1-deps install-gtk2-deps
 	cd plugins
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-plugins
 	cd ..
@@ -580,12 +580,12 @@ install-required-deps:
 	xcopy $(PCRE_DIR)\bin\pcre.dll . /d /y
 !ENDIF
 
-clean_deps:
+clean-deps:
 	rm -f *.dll
 	rm -rf etc
 	rm -rf lib
 	cd plugins
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean_deps
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean-deps
 	cd ..
 
 

doc/Makefile.nmake

@@ -83,14 +83,9 @@ ethereal-filter.html: ethereal-filter.pod ../config.h
 
 ethereal-filter.pod: ethereal-filter.pod.template  ../tethereal.exe
 	cd ..
-	xcopy wiretap\wiretap-$(WTAP_VERSION).dll . /d /y
-!IFDEF ENABLE_LIBETHEREAL
-	xcopy epan\libethereal.dll . /d /y
-	cd plugins
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-plugins
-	cd ..
-!ENDIF
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-deps
 	tethereal.exe -G | $(PERL) doc\dfilter2pod.pl doc\ethereal-filter.pod.template > doc\ethereal-filter.pod
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean-deps
 	cd doc
 
 capinfos.1: capinfos.pod ../config.h

plugins/Makefile.nmake

@@ -339,7 +339,7 @@ install-plugins:
 	xcopy xml\*.dll $(VERSION) /d /y
 !ENDIF
 
-clean_deps:
+clean-deps:
 	rm -rf $(VERSION)