git.samba.org / obnox / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
"hf_sna_rh_csi" is now an FT_UINT8 field, so add it with
[obnox/wireshark/wip.git] / Makefile.nmake
diff --git a/Makefile.nmake b/Makefile.nmake
index 25f1c57c43e2a15e150def1a48a33b5fb4680de7..32fb889d414fd3deccc317e0a4fd310933dc081b 100644 (file)
--- 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.52 2000/08/12 05:41:01 guy Exp $
+# $Id: Makefile.nmake,v 1.69 2000/12/23 08:06:14 guy Exp $
 
 include config.nmake
 
@@ -13,7 +13,7 @@ LINK= link
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
 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$(GTK_DIR) /Iepan /Iwiretap /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
        /I$(PCAP_DIR)/include
 
 {$S}.c{$O}.obj::
@@ -22,6 +22,7 @@ CFLAGS=/MT -DHAVE_CONFIG_H $(LOCAL_CFLAGS) /I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule \
 DISSECTOR_SOURCES = \
        packet-aarp.c  \
        packet-afs.c   \
+       packet-aim.c   \
        packet-arp.c   \
        packet-ascend.c\
        packet-atalk.c \
@@ -31,6 +32,7 @@ DISSECTOR_SOURCES = \
        packet-bootp.c \
        packet-bootparams.c \
        packet-bpdu.c  \
+       packet-bxxp.c \
        packet-cdp.c   \
        packet-cgmp.c  \
        packet-clip.c  \
@@ -45,15 +47,19 @@ DISSECTOR_SOURCES = \
        packet-eth.c   \
        packet-ethertype.c   \
        packet-fddi.c  \
+       packet-frame.c  \
        packet-ftp.c   \
        packet-giop.c  \
        packet-gre.c   \
+       packet-gvrp.c  \
        packet-h1.c    \
+       packet-h261.c  \
        packet-hsrp.c  \
        packet-http.c  \
        packet-icmpv6.c\
        packet-icp.c   \
        packet-icq.c   \
+       packet-igrp.c  \
        packet-imap.c   \
        packet-ip.c    \
        packet-ipp.c   \
@@ -61,6 +67,7 @@ DISSECTOR_SOURCES = \
        packet-ipv6.c  \
        packet-ipx.c   \
        packet-irc.c   \
+       packet-ieee80211.c \
        packet-isakmp.c\
        packet-isis.c  \
        packet-isis-clv.c \
@@ -73,6 +80,7 @@ DISSECTOR_SOURCES = \
        packet-lapb.c  \
        packet-lapd.c  \
        packet-ldap.c  \
+       packet-ldp.c  \
        packet-llc.c   \
        packet-lpd.c   \
        packet-mapi.c  \
@@ -117,12 +125,15 @@ DISSECTOR_SOURCES = \
        packet-sap.c   \
        packet-sctp.c   \
        packet-sdp.c   \
+       packet-sip.c   \
+       packet-sll.c   \
        packet-smb.c   \
        packet-smb-browse.c \
        packet-smb-common.c \
        packet-smb-logon.c \
        packet-smb-mailslot.c \
        packet-smb-pipe.c \
+       packet-smtp.c \
        packet-sna.c   \
        packet-snmp.c   \
        packet-socks.c \
@@ -136,6 +147,7 @@ DISSECTOR_SOURCES = \
        packet-tftp.c  \
        packet-time.c  \
        packet-tns.c \
+       packet-tpkt.c  \
        packet-tr.c    \
        packet-trmac.c \
        packet-udp.c   \
@@ -146,37 +158,31 @@ DISSECTOR_SOURCES = \
        packet-vtp.c  \
        packet-wccp.c \
        packet-who.c  \
+       packet-wsp.c \
+       packet-wtp.c \
        packet-x11.c    \
        packet-x25.c   \
+       packet-xot.c   \
        packet-yhoo.c  \
        packet-ypbind.c \
        packet-ypserv.c \
-       packet-ypxfr.c
+       packet-ypxfr.c \
+       packet-zebra.c
 
 DISSECTOR_OBJECTS = $(DISSECTOR_SOURCES:.c=.obj)
 
 ETHEREAL_COMMON_OBJECTS = \
        asn1.obj         \
        column.obj       \
-       conversation.obj \
-       dfilter-grammar.obj \
-       dfilter-scanner.obj \
-       dfilter.obj      \
-       except.obj       \
        follow.obj       \
        getopt.obj       \
+       in_cksum.obj     \
        ipproto.obj      \
-       ipv4.obj         \
-       packet.obj       \
-       plugins.obj      \
        prefs.obj        \
        print.obj        \
-       proto.obj        \
        ps.obj           \
        ptvcursor.obj    \
        register.obj     \
-       resolv.obj       \
-       tvbuff.obj       \
        util.obj         \
        xdlc.obj         \
 
@@ -195,32 +201,31 @@ tethereal_OBJECTS = \
 EXTRA_OBJECTS = \
        snprintf.obj    \
        strerror.obj    \
-       mkstemp.obj     \
-       inet_aton.obj     \
-       inet_pton.obj     \
-       inet_ntop.obj
+       mkstemp.obj
 
-ethereal_LIBS= wiretap\libwtap.lib gtk\libui.lib wsock32.lib user32.lib \
+ethereal_LIBS= wiretap\libwtap.lib gtk\libui.lib epan\ethereal.lib \
+       wsock32.lib user32.lib \
        $(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \
        $(GTK_DIR)\gdk\gdk-$(GTK_VERSION).lib \
        $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
-       $(GLIB_DIR)\gmodule-$(GLIB_VERSION).lib \
+       $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \
        $(PCAP_DIR)\lib\libpcap.lib
 
-tethereal_LIBS= wiretap\libwtap.lib wsock32.lib user32.lib \
+tethereal_LIBS= wiretap\libwtap.lib epan\ethereal.lib \
+       wsock32.lib user32.lib \
        $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
-       $(GLIB_DIR)\gmodule-$(GLIB_VERSION).lib \
+       $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \
        $(PCAP_DIR)\lib\libpcap.lib
 
 editcap_LIBS= wiretap\libwtap.lib wsock32.lib user32.lib \
        $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
-       $(GLIB_DIR)\gmodule-$(GLIB_VERSION).lib
+       $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib
 
 EXECUTABLES=ethereal.exe tethereal.exe editcap.exe
 
 RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res
 
-all: wiretap gtk $(EXECUTABLES) $(RESOURCES)
+all: wiretap gtk epan $(EXECUTABLES) $(RESOURCES)
 
 ethereal.exe   : config.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res wiretap\libwtap.lib gtk\libui.lib plugins
        @echo Linking $@
@@ -249,17 +254,9 @@ ps.c       : rdps.exe print.ps
 packet-ncp2222.c : ncp2222.py
        $(PYTHON) ncp2222.py > packet-ncp2222.c
 
-dfilter-scanner.obj : dfilter-scanner.c dfilter-grammar.h
-
-dfilter-scanner.c : dfilter-scanner.l
-       $(LEX) -Pdfilter_ -odfilter-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
-
-register.c: packet.c $(DISSECTOR_SOURCES)
+register.c: $(DISSECTOR_SOURCES)
        @echo Making register.c
-       @sh make-reg-dotc . packet.c $(DISSECTOR_SOURCES)
+       @sh make-reg-dotc . $(DISSECTOR_SOURCES)
 
 clean:
        rm -f $(ethereal_OBJECTS) $(EXTRA_OBJECTS) $(EXECUTABLES) \
@@ -269,6 +266,8 @@ clean:
        nmake -f Makefile.nmake clean
        cd ../gtk
        nmake -f Makefile.nmake clean
+       cd ../epan
+       nmake -f Makefile.nmake clean
        cd ../plugins
        nmake -f Makefile.nmake clean
        cd ..
@@ -283,6 +282,11 @@ gtk::
        nmake -f Makefile.nmake
        cd ..
 
+epan::
+       cd epan
+       nmake -f Makefile.nmake
+       cd ..
+
 plugins::
        cd plugins
        nmake -f Makefile.nmake
git mirror of the wireshark svn