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.am | |
| parent | 9625720a39eddda6ef4c34725fe8017160cf05d9 (diff) | |
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.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index c109d7b077..15900be8ec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.427 2002/05/03 16:23:25 nneul Exp $ +# $Id: Makefile.am,v 1.428 2002/05/09 23:50:24 gram Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -961,7 +961,7 @@ text2pcap.1: doc/text2pcap.pod $(MAKE) ../text2pcap.1 ) packet-ncp2222.c : ncp2222.py - $(PYTHON) $(srcdir)/ncp2222.py > $@ + $(PYTHON) $(srcdir)/ncp2222.py -o $@ libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck |