Guy Harris <guy@xxxxxxxxxx> writes:
> On Thu, Feb 28, 2002 at 10:14:35AM -0500, Andrew C. Feren wrote:
> > I submitted a patch that fixed this awile ago, but it never got
> > applied. It was mixed in with some other changes that were more
> > controversial so I suspect it was just over looked. Here is just the
> > Makefile.nmake portion of the patches I submitted.
>
> Unfortunately, it's just the part that patches "doc/Makefile.nmake",
> which isn't the Makefile.nmake file with which he's having trouble.
Ooops. Sorry about that. Try this one.
Index: Makefile.nmake
===================================================================
RCS file: /cvsroot/ethereal/Makefile.nmake,v
retrieving revision 1.165
diff -u -r1.165 Makefile.nmake
--- Makefile.nmake 2002/01/21 10:21:57 1.165
+++ Makefile.nmake 2002/01/24 20:14:04
@@ -3,6 +3,7 @@
#
# $Id: Makefile.nmake,v 1.165 2002/01/21 10:21:57 guy Exp $
+TOP=.
include config.nmake
include <win32.mak>
@@ -145,8 +146,10 @@
packet-mtp3.c \
packet-nbipx.c \
packet-nbns.c \
+!IFDEF PYTHON
packet-ncp.c \
packet-ncp2222.c \
+!ENDIF
packet-ndmp.c \
packet-netbios.c \
packet-nfs.c \
@@ -403,11 +406,13 @@
$(PYTHON) ncp2222.py > packet-ncp2222.c
register.c: $(DISSECTOR_SRC)
- @echo Making register.c
- @$(PYTHON) make-reg-dotc.py . $(DISSECTOR_SRC)
-# How are ifdef's done in NMAKE? It would be nice
-# to use python if PYTHON is defined, otherwise try to use shell.
-# @sh make-reg-dotc . $(DISSECTOR_SRC)
+!IFDEF PYTHON
+ @echo Making register.c (using python)
+ @$(PYTHON) make-reg-dotc.py . $(DISSECTOR_SRC)
+!ELSE
+ @echo Making register.c (using sh)
+ @sh make-reg-dotc register.c $(DISSECTOR_SRC)
+!ENDIF
text2pcap-scanner.c : text2pcap-scanner.l
$(LEX) -otext2pcap-scanner.c text2pcap-scanner.l
--
-Andrew Feren
Cetacean Networks, Inc.
Portsmouth, NH
