diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2002-05-09 23:50:34 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2002-05-09 23:50:34 +0000 |
| commit | 41cc7f0707c5c62ae5651fcd70a9e9b12a4ce387 (patch) | |
| tree | 46737517f86dbb9ec37210737dd521c9c3920608 /Makefile.nmake | |
| parent | 9625720a39eddda6ef4c34725fe8017160cf05d9 (diff) | |
| download | wireshark-41cc7f0707c5c62ae5651fcd70a9e9b12a4ce387.tar.gz wireshark-41cc7f0707c5c62ae5651fcd70a9e9b12a4ce387.tar.bz2 wireshark-41cc7f0707c5c62ae5651fcd70a9e9b12a4ce387.zip | |
Merge the work in Novell_NCP_branch into the mainline code.
A little work still needs to be done on the new NCP dissector -- make
some of the COL_INFO texts more useful, handle a Unicode issue, and
modify some of the cases that use "request conditions".
But the NCP dissector as it stands is very usable now.
Note: I didn't merge in the PROTO_LENGTH_UNTIL_END macro... I wanted
to think about the various possible macros and review an email conversation
I had with Guy on the subject.
svn path=/trunk/; revision=5432
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 61dc465bf9..47ab19b91f 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.183 2002/05/03 15:50:11 nneul Exp $ +# $Id: Makefile.nmake,v 1.184 2002/05/09 23:50:24 gram Exp $ include config.nmake include <win32.mak> @@ -413,7 +413,7 @@ x11-declarations.h x11-register-info.h: x11-fields process-x11-fields.pl packet-ncp2222.c : ncp2222.py !IFDEF PYTHON @echo Making packet-ncp2222.c - $(PYTHON) ncp2222.py > packet-ncp2222.c + $(PYTHON) ncp2222.py -o packet-ncp2222.c !ELSE @echo Faking packet-ncp2222.c... @echo Python is required to build the NCP disector |