Graham Bloice's changes to, on Win32 using Microsoft's "nmake":

	build "register.c" in the top-level Makefile;

	set path in "config.nmake" to include the Cygwin directory for
	tools - those tools are needed to build "register.c";

	remove constructed source files, and some additional object
	files, when doing "nmake clean".

svn path=/trunk/; revision=1896

1 files changed, 209 insertions, 5 deletions

diff --git a/Makefile.nmake b/Makefile.nmake
index 9cd622dfc4..4227e250f6 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: nmake -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.32 2000/04/21 01:45:58 guy Exp $
+# $Id: Makefile.nmake,v 1.33 2000/04/29 07:34:35 guy Exp $
 
 include config.nmake
 
@@ -16,6 +16,208 @@ CFLAGS=/MT -DHAVE_CONFIG_H $(LOCAL_CFLAGS) /I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule \
 	/I$(GTK_DIR) /Iwiretap /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
 	/I$(PCAP_DIR)/include
 
+DISSECTOR_SOURCES = \
+	packet-aarp.c  \
+	packet-afs.c   \
+	packet-afs.h   \
+	packet-arp.c   \
+	packet-arp.h   \
+	packet-ascend.c\
+	packet-ascend.h\
+	packet-atalk.c \
+	packet-atalk.h \
+	packet-atm.c   \
+	packet-atm.h   \
+	packet-auto_rp.c   \
+	packet-bgp.c   \
+	packet-bgp.h   \
+	packet-bootp.c \
+	packet-bootparams.c \
+	packet-bootparams.h \
+	packet-bpdu.c  \
+	packet-bpdu.h  \
+	packet-cdp.c   \
+	packet-cdp.h   \
+	packet-cgmp.c  \
+	packet-cgmp.h  \
+	packet-clip.c  \
+	packet-clip.h  \
+	packet-clnp.c  \
+	packet-clnp.h  \
+	packet-data.c  \
+	packet-ddtp.c  \
+	packet-ddtp.h  \
+	packet-dns.c   \
+	packet-dns.h   \
+	packet-esis.h  \
+	packet-esis.c  \
+	packet-eth.c   \
+	packet-eth.h   \
+	packet-ethertype.c   \
+	packet-fddi.c  \
+	packet-fddi.h  \
+	packet-ftp.c   \
+	packet-giop.c  \
+	packet-giop.h  \
+	packet-gre.c   \
+	packet-h1.c    \
+	packet-h1.h    \
+	packet-hsrp.c  \
+	packet-http.c  \
+	packet-http.h  \
+	packet-icmpv6.c\
+	packet-icp.c   \
+	packet-icq.c   \
+	packet-imap.c   \
+	packet-ip.c    \
+	packet-ip.h    \
+	packet-ipp.c   \
+	packet-ipp.h   \
+	packet-ipsec.c \
+	packet-ipsec.h \
+	packet-ipv6.c  \
+	packet-ipv6.h  \
+	packet-ipx.c   \
+	packet-ipx.h   \
+	packet-irc.c   \
+	packet-isakmp.c\
+	packet-isis.h  \
+	packet-isis.c  \
+	packet-isis-clv.h \
+	packet-isis-clv.c \
+	packet-isis-hello.h \
+	packet-isis-hello.c \
+	packet-isis-lsp.h \
+	packet-isis-lsp.c \
+	packet-isis-snp.h \
+	packet-isis-snp.c \
+	packet-isl.c   \
+	packet-isl.h   \
+	packet-l2tp.c  \
+	packet-lapb.c  \
+	packet-lapb.h  \
+	packet-lapd.c  \
+	packet-lapd.h  \
+	packet-ldap.c  \
+	packet-ldap.h  \
+	packet-llc.c   \
+	packet-llc.h   \
+	packet-lpd.c   \
+	packet-mapi.c  \
+	packet-mount.c \
+	packet-mount.h \
+	packet-mpls.c \
+	packet-msproxy.c \
+	packet-nbipx.c \
+	packet-nbipx.h \
+	packet-nbns.c  \
+	packet-ncp.c   \
+	packet-ncp.h   \
+	packet-netbios.c \
+	packet-netbios.h \
+	packet-nfs.c   \
+	packet-nfs.h   \
+	packet-nlm.c   \
+	packet-nlm.h   \
+	packet-nntp.c  \
+	packet-ntp.c  \
+	packet-ntp.h  \
+	packet-null.c  \
+	packet-null.h  \
+	packet-osi.c   \
+	packet-osi.h   \
+	packet-osi-options.c \
+	packet-osi-options.h \
+	packet-ospf.c  \
+	packet-ospf.h  \
+	packet-pim.c   \
+	packet-pop.c   \
+	packet-portmap.c   \
+	packet-portmap.h   \
+	packet-ppp.c   \
+	packet-ppp.h   \
+	packet-pppoe.c \
+	packet-pptp.c  \
+	packet-q2931.c \
+	packet-q2931.h \
+	packet-q931.c  \
+	packet-q931.h  \
+	packet-radius.c\
+	packet-raw.c   \
+	packet-raw.h   \
+	packet-rip.c   \
+	packet-rip.h   \
+	packet-ripng.c \
+	packet-ripng.h \
+	packet-rlogin.c \
+	packet-rpc.c   \
+	packet-rpc.h   \
+	packet-rsvp.c  \
+	packet-rtcp.c  \
+	packet-rtcp.h  \
+	packet-rtp.c   \
+	packet-rtp.h   \
+	packet-rtsp.c  \
+	packet-rx.c  \
+	packet-rx.h  \
+	packet-sap.c   \
+	packet-sdp.c   \
+	packet-sdp.h   \
+	packet-smb.c   \
+	packet-smb.h   \
+	packet-smb-browse.c \
+	packet-smb-common.c \
+	packet-smb-common.h \
+	packet-smb-logon.c \
+	packet-smb-mailslot.c \
+	packet-smb-pipe.c \
+	packet-sna.c   \
+	packet-sna.h   \
+	packet-snmp.c	\
+	packet-snmp.h	\
+	packet-socks.c \
+	packet-srvloc.c \
+	packet-sscop.c \
+	packet-sscop.h \
+	packet-stat.c   \
+	packet-stat.h   \
+	packet-tacacs.c \
+	packet-tcp.c   \
+	packet-tcp.h   \
+	packet-telnet.c\
+	packet-tftp.c  \
+	packet-tftp.h  \
+	packet-time.c  \
+	packet-tns.c \
+	packet-tns.h \
+	packet-tr.c    \
+	packet-tr.h    \
+	packet-trmac.c \
+	packet-trmac.h \
+	packet-udp.c   \
+	packet-udp.h   \
+	packet-v120.c \
+	packet-v120.h \
+	packet-vines.c \
+	packet-vines.h \
+	packet-vlan.c \
+	packet-vlan.h \
+	packet-vrrp.c \
+	packet-vtp.c  \
+	packet-vtp.h  \
+	packet-wccp.c \
+	packet-who.c  \
+	packet-x25.c   \
+	packet-x25.h   \
+	packet-yhoo.c  \
+	packet-yhoo.h  \
+	packet-ypbind.c \
+	packet-ypbind.h \
+	packet-ypserv.c \
+	packet-ypserv.h \
+	packet-ypxfr.c \
+	packet-ypxfr.h 
+
 DISSECTOR_OBJECTS = \
 	packet-aarp.obj  \
 	packet-afs.obj   \
@@ -232,12 +434,14 @@ dfilter-scanner.c : dfilter-scanner.l
 dfilter-grammar.c dfilter-grammar.h : dfilter-grammar.y
 	$(YACC) $(YACC_OPTS) -d -p dfilter_ dfilter-grammar.y -o dfilter-grammar.c
 
-#
-# TODO: Create register.c
-#
+register.c: packet.c $(DISSECTOR_SOURCES)
+	@echo Making register.c
+	@sh make-reg-dotc . packet.c $(DISSECTOR_SOURCES)
 
 clean:
-	rm -f $(ethereal_OBJECTS) $(EXTRA_OBJECTS) $(EXECUTABLES) tethereal.obj editcap.obj
+	rm -f $(ethereal_OBJECTS) $(EXTRA_OBJECTS) $(EXECUTABLES) \
+		tethereal.obj editcap.obj register.c dfilter-scanner.c \
+		dfilter-grammar.c dfilter-grammar.h rdps.obj
 	cd wiretap
 	nmake -f Makefile.nmake clean
 	cd ../gtk