5 files changed, 48 insertions, 13 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 5632852336..05cf261346 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.161 2002/01/04 06:57:07 guy Exp $
+# $Id: Makefile.nmake,v 1.162 2002/01/04 21:20:16 guy Exp $
 
 include config.nmake
 include <win32.mak>
@@ -329,6 +329,7 @@ mergecap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
 dftest_LIBS= epan\ethereal.lib \
 	epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
 	wsock32.lib user32.lib \
+        wiretap\wiretap-$(WTAP_VERSION).lib \
 	$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
 	$(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib
 
@@ -338,13 +339,17 @@ RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res image\mergeca
 
 all: tools wiretap gtk epan image $(EXECUTABLES) $(RESOURCES)
 
-ethereal.exe	: config.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res wiretap\wiretap-$(WTAP_VERSION).lib gtk\libui.lib plugins
+$(RESOURCES): image
+
+wiretap\wiretap-$(WTAP_VERSION).lib: wiretap
+
+ethereal.exe	: config.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) epan gtk image\ethereal.res wiretap\wiretap-$(WTAP_VERSION).lib gtk\libui.lib plugins
 	@echo Linking $@
 	$(LINK) @<<
 		/OUT:ethereal.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(ethereal_LIBS) $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res
 <<
 
-tethereal.exe	: config.h $(tethereal_OBJECTS) $(EXTRA_OBJECTS) image\tethereal.res wiretap\wiretap-$(WTAP_VERSION).lib plugins
+tethereal.exe	: config.h $(tethereal_OBJECTS) $(EXTRA_OBJECTS) epan image\tethereal.res wiretap\wiretap-$(WTAP_VERSION).lib plugins
 	@echo Linking $@
 	$(LINK) @<<
 		/OUT:tethereal.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(tethereal_LIBS) $(tethereal_OBJECTS) $(EXTRA_OBJECTS) image\tethereal.res
@@ -410,7 +415,7 @@ clean:
 		tethereal.obj editcap.obj mergecap.obj text2pcap.obj \
 		text2pcap-scanner.obj text2pcap-scanner.c register.c \
 		rdps.obj rdps.pdb config.h ps.c packet-ncp2222.c register.c \
-		rdps.exe rdps.ilk $(RESOURCES)
+		rdps.exe rdps.ilk dftest.obj dftest.exe $(RESOURCES)
 	cd wiretap
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../gtk
@@ -423,7 +428,11 @@ clean:
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../image
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
-	cd ..
+	cd ../doc
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+	cd ../packaging/nsis
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+	cd ../..
 
 tools::
 	cd tools
diff --git a/config.nmake b/config.nmake
index 8d700832bf..e6baaa4ef3 100644
--- a/config.nmake
+++ b/config.nmake
@@ -1,4 +1,4 @@
-# $Id: config.nmake,v 1.21 2002/01/04 06:57:07 guy Exp $
+# $Id: config.nmake,v 1.22 2002/01/04 21:20:16 guy Exp $
 
 VERSION=0.9.0
 RC_VERSION=0.9.0
@@ -16,10 +16,10 @@ LOCAL_CFLAGS=-Zi
 LOCAL_LDFLAGS=/DEBUG
 
 # Set PDB_FILE according to your VC++ version 
-PDB_FILE=vc60.pdb
+PDB_FILE=vc*.pdb
 
 # Set path if you need to find some binary
-PATH=c:\cygnus\cygwin-b20\H-i586-cygwin32\bin;c:\python22;c:\ethereal-0.9.0\wiretap;c:\program files\gnu;$(PATH)
+PATH=c:\cygnus\cygwin-b20\H-i586-cygwin32\bin;c:\python22;c:\ethereal\wiretap;c:\program files\common files\gnu;$(PATH)
 
 PERL=perl
 POD2MAN=pod2man
diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake
index fc6cfe4e7d..ac3de82268 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.6 2002/01/04 06:57:08 guy Exp $
+# $Id: Makefile.nmake,v 1.7 2002/01/04 21:20:17 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -41,6 +41,11 @@ ethereal.html: ethereal.pod ../config.h
 	--noindex                                 \
 	> ethereal.html
 
+../tethereal.exe:
+	cd ..
+	$(MAKE) -f makefile.nmake tethereal.exe
+	cd doc
+
 ethereal.pod: ethereal.pod.template  ../tethereal.exe
 	..\\tethereal.exe -G | $(PERL) dfilter2pod.pl ethereal.pod.template > ethereal.pod
 
diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index 75a179a047..161d0374a4 100644
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -31,10 +31,15 @@ OBJECTS = \
 	sttype-test.obj		\
 	syntax-tree.obj
 
-
 dfilter.lib	: $(OBJECTS)
 	lib /out:dfilter.lib $(OBJECTS)
 
+$(OBJECTS): ..\config.h
+
+..\config.h:
+	cd ..
+	$(MAKE) -f makefile.nmake config.h
+	cd dfilter
 
 clean:
 	rm -f $(OBJECTS) scanner.c grammar.c grammar.h grammar.out \
@@ -46,6 +51,12 @@ scanner.c : scanner.l
 scanner.obj : scanner.c grammar.h
 
 grammar.h : grammar.c
-grammar.c : grammar.lemon
+grammar.c : grammar.lemon $(LEMON)\lemon.exe
 	$(LEMON)\lemon.exe t=$(LEMON)\lempar.c grammar.lemon 
 
+$(LEMON)\lemon.exe:
+	cd ../../tools/lemon
+	$(MAKE) -f makefile.nmake
+	cd ../../epan/dfilter
+
+
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 01d61838b0..d88bde2c27 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.9 2001/12/19 19:16:12 guy Exp $
+# $Id: Makefile.nmake,v 1.10 2002/01/04 21:20:20 guy Exp $
 #
 #
 # NSIS is a free packager/installer/uninstaller program for Win32.
@@ -27,7 +27,6 @@ PLUGINS=../../plugins/mgcp/mgcp.dll	\
 
 DELIVERABLES=$(EXE) $(DLL) $(DOC) $(GPL) $(PLUGINS) 
 
-
 ethereal-setup.exe : ethereal.nsi $(DELIVERABLES)
 	$(MAKENSIS) ethereal.nsi
 
@@ -38,3 +37,14 @@ ethereal.nsi : ethereal.nsi.in
 
 clean:
 	rm -f ethereal.nsi ethereal-setup.exe
+
+$(DOC):
+	cd ../../doc
+	$(MAKE) -f makefile.nmake
+	cd ../packaging/nsis
+
+$(EXE) $(DLL):
+	cd ../..
+	$(MAKE) -f makefile.nmake
+	cd packaging/nsis
+