git.samba.org / obnox / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Put the error code into the Info column symbolically, if possible.
[obnox/wireshark/wip.git] / Makefile.nmake
diff --git a/Makefile.nmake b/Makefile.nmake
index 45aa1144f0135eb625efbf314246c46d35cfb45b..b6d4d9d9c1b8eee43ec7bea53d51f236e5e13615 100644 (file)
--- 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.106 2001/05/20 22:20:33 guy Exp $
+# $Id: Makefile.nmake,v 1.135 2001/11/01 21:52:44 guy Exp $
 
 include config.nmake
 include <win32.mak>
@@ -48,10 +48,17 @@ DISSECTOR_SRC = \
        packet-cups.c  \
        packet-data.c  \
        packet-dcerpc.c  \
+       packet-dcerpc-conv.c  \
+       packet-dcerpc-epm.c  \
+       packet-dcerpc-mgmt.c  \
+       packet-dcerpc-remact.c  \
+       packet-dcerpc-oxid.c  \
        packet-ddtp.c  \
        packet-dec-bpdu.c \
        packet-diameter.c \
        packet-dns.c   \
+       packet-dsi.c   \
+       packet-dvmrp.c \
        packet-eigrp.c \
        packet-esis.c  \
        packet-eth.c   \
@@ -61,6 +68,8 @@ DISSECTOR_SRC = \
        packet-frame.c  \
        packet-ftp.c   \
        packet-giop.c  \
+       packet-gmrp.c \
+       packet-gnutella.c \
        packet-gre.c   \
        packet-gtp.c   \
        packet-gvrp.c  \
@@ -69,9 +78,12 @@ DISSECTOR_SRC = \
        packet-hclnfsd.c  \
        packet-hsrp.c  \
        packet-http.c  \
+       packet-icap.c  \
        packet-icmpv6.c\
        packet-icp.c   \
        packet-icq.c   \
+       packet-ieee80211.c \
+       packet-ieee8023.c \
        packet-igmp.c  \
        packet-igrp.c  \
        packet-imap.c   \
@@ -81,15 +93,15 @@ DISSECTOR_SRC = \
        packet-ipv6.c  \
        packet-ipx.c   \
        packet-irc.c   \
-       packet-ieee80211.c \
-       packet-ieee8023.c \
        packet-isakmp.c\
+       packet-iscsi.c \
        packet-isis.c  \
        packet-isis-clv.c \
        packet-isis-hello.c \
        packet-isis-lsp.c \
        packet-isis-snp.c \
        packet-isl.c   \
+       packet-isup.c  \
        packet-iua.c   \
        packet-kerberos.c \
        packet-klm.c   \
@@ -102,13 +114,20 @@ DISSECTOR_SRC = \
        packet-llc.c   \
        packet-lmi.c   \
        packet-lpd.c   \
+       packet-m2pa.c  \
        packet-m3ua.c  \
        packet-mapi.c  \
        packet-mbtcp.c \
        packet-mip.c  \
+       packet-mmse.c  \
        packet-mount.c \
+       packet-mpeg1.c  \
        packet-mpls.c \
+       packet-mrdisc.c \
+       packet-msdp.c  \
+       packet-msnip.c \
        packet-msproxy.c \
+       packet-mtp3.c \
        packet-nbipx.c \
        packet-nbns.c  \
        packet-ncp.c   \
@@ -123,6 +142,7 @@ DISSECTOR_SRC = \
        packet-osi.c   \
        packet-osi-options.c \
        packet-ospf.c  \
+       packet-pgm.c   \
        packet-pim.c   \
        packet-pop.c   \
        packet-portmap.c   \
@@ -132,6 +152,9 @@ DISSECTOR_SRC = \
        packet-q2931.c \
        packet-q931.c  \
        packet-quake.c \
+       packet-quakeworld.c \
+       packet-quake2.c \
+       packet-quake3.c \
        packet-radius.c\
        packet-ranap.c \
        packet-raw.c   \
@@ -151,6 +174,7 @@ DISSECTOR_SRC = \
        packet-sctp.c   \
        packet-sdp.c   \
        packet-sip.c   \
+       packet-skinny.c   \
        packet-sll.c   \
        packet-smb.c   \
        packet-smb-browse.c \
@@ -165,6 +189,7 @@ DISSECTOR_SRC = \
        packet-spray.c \
        packet-srvloc.c \
        packet-sscop.c \
+       packet-ssl.c   \
        packet-stat.c   \
        packet-stat-notify.c \
        packet-sual.c   \
@@ -178,6 +203,7 @@ DISSECTOR_SRC = \
        packet-tpkt.c  \
        packet-tr.c    \
        packet-trmac.c \
+       packet-ucp.c   \
        packet-udp.c   \
        packet-v120.c \
        packet-vines.c \
@@ -204,20 +230,24 @@ DISSECTOR_SRC = \
 DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
 
 ETHEREAL_COMMON_OBJECTS = \
+       afn.obj          \
        asn1.obj         \
        capture-wpcap.obj       \
        column.obj       \
        follow.obj       \
        getopt.obj       \
        in_cksum.obj     \
+       int-64bit.obj   \
        ipproto.obj      \
        prefs.obj        \
        print.obj        \
        ps.obj           \
        ptvcursor.obj    \
+       reassemble.obj   \
        register.obj     \
        util.obj         \
        xdlc.obj         \
+       xmlstub.obj      \
 
 ethereal_OBJECTS = \
        $(DISSECTOR_OBJECTS) \
@@ -241,7 +271,8 @@ dftest_OBJECTS = \
 EXTRA_OBJECTS = \
 #      snprintf.obj    \
 #      strerror.obj    \
-       mkstemp.obj
+       mkstemp.obj     \
+       strptime.obj
 
 ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
        gtk\libui.lib epan\ethereal.lib \
@@ -265,15 +296,20 @@ editcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
        $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
        $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib
 
+mergecap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
+       wsock32.lib user32.lib \
+       $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
+       $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib
+
 dftest_LIBS= epan\ethereal.lib \
        epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
        wsock32.lib user32.lib \
        $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
        $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib
 
-EXECUTABLES=ethereal.exe tethereal.exe editcap.exe
+EXECUTABLES=ethereal.exe tethereal.exe editcap.exe mergecap.exe text2pcap.exe
 
-RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res
+RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res image\mergecap.res image\text2pcap.res
 
 all: tools wiretap gtk epan image $(EXECUTABLES) $(RESOURCES)
 
@@ -295,6 +331,18 @@ editcap.exe        : config.h editcap.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).li
                /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj $(editcap_LIBS) image\editcap.res
 <<
 
+mergecap.exe   : config.h mergecap.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\mergecap.res
+       @echo Linking $@
+       $(LINK) @<<
+               /OUT:mergecap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console mergecap.obj getopt.obj $(mergecap_LIBS) image\mergecap.res
+<<
+
+text2pcap.exe  : config.h text2pcap.obj text2pcap-scanner.obj getopt.obj image\text2pcap.res
+       @echo Linking $@
+       $(LINK) @<<
+               /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console text2pcap.obj text2pcap-scanner.obj getopt.obj image\text2pcap.res
+<<
+
 dftest.exe     : $(dftest_OBJECTS) $(EXTRA_OBJECTS)
        $(LINK) @<<
                /OUT:dftest.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dftest_LIBS) $(dftest_OBJECTS) $(EXTRA_OBJECTS)
@@ -329,9 +377,13 @@ register.c: $(DISSECTOR_SRC)
 #      to use python if PYTHON is defined, otherwise try to use shell.
 #      @sh make-reg-dotc . $(DISSECTOR_SRC)
 
+text2pcap-scanner.c : text2pcap-scanner.l
+       $(LEX) -otext2pcap-scanner.c text2pcap-scanner.l
+
 clean:
        rm -f $(ethereal_OBJECTS) $(EXTRA_OBJECTS) $(EXECUTABLES) \
-               tethereal.obj editcap.obj register.c rdps.obj config.h \
+               tethereal.obj editcap.obj mergecap.obj text2pcap.obj \
+               text2pcap-scanner.c register.c rdps.obj config.h \
                ps.c packet-ncp2222.c register.c
        cd wiretap
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
git mirror of the wireshark svn