summaryrefslogtreecommitdiff
path: root/Makefile.nmake
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 /Makefile.nmake
parent4029a91b8baa109f854cfab6f3d9db9b8d05737c (diff)
downloadwireshark-00f087b2f004f595d615686ec28f9622a0d046ef.tar.gz
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 'Makefile.nmake')
-rw-r--r--Makefile.nmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 032af855d3..14f1096499 100644
--- a/Makefile.nmake
+++ b/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 ..