aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2005-09-06 18:41:25 +0000
committerGerald Combs <gerald@wireshark.org>2005-09-06 18:41:25 +0000
commit00f087b2f004f595d615686ec28f9622a0d046ef (patch)
tree886bf9367cc3245337d4d3746dd48d3e5795c2d4 /doc
parent4029a91b8baa109f854cfab6f3d9db9b8d05737c (diff)
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
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.nmake9
1 files changed, 2 insertions, 7 deletions
diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake
index 7337a3ad3a..efdb784143 100644
--- a/doc/Makefile.nmake
+++ b/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