From: guy <guy>
Date: Tue, 27 Jan 2004 23:39:38 +0000 (+0000)
Subject: Propagate from the main branch
X-Git-Tag: tcpdump-3.8.2~36
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/79766e2e893135c1876bbbb91da4cce979aece2c

Propagate from the main branch

	revision 1.9
	date: 2004/01/27 23:36:59;  author: guy;  state: Exp;  lines: +2 -3
	Remove "bpf_dump.o" from the list of things to build - "bpf_dump()" now
	comes with libpcap.

	Remove "print-netbios.o" from the list of things to build - it's not
	used any more.

	Add "oui.o" to the list of things to build - it *is* used.

	Remove a backslash from the last entry in the list of things to build.

	revision 1.8
	date: 2004/01/26 14:29:15;  author: risso;  state: Exp;  lines: +3 -1
	Added some missing files in order to correctly compile under Cygnus
---

diff --git a/win32/prj/GNUmakefile b/win32/prj/GNUmakefile
index 46605641..a1931ac6 100644
--- a/win32/prj/GNUmakefile
+++ b/win32/prj/GNUmakefile
@@ -22,7 +22,7 @@ LDFLAGS =
 LIBS = -L ${PCAP_DIR}/WPCAP/LIB -lwpcap -lwsock32
 OBJS = \
 	../../addrtoname.o \
-	../../bpf_dump.o \
+	../../gmpls.o \
 	../../gmt2local.o \
 	../../missing/inet_aton.o \
 	../../missing/inet_ntop.o \
@@ -32,15 +32,18 @@ OBJS = \
 	../../missing/strsep.o \
 	../../missing/inet_pton.o \
 	../../machdep.o \
+	../../oui.o \
 	../../parsenfsfh.o \
 	../../print-802_11.o \
 	../../print-ah.o \
+	../../print-aodv.o \
 	../../print-arcnet.o \
 	../../print-arp.o \
 	../../print-ascii.o \
 	../../print-atalk.o \
 	../../print-atm.o \
 	../../print-beep.o \
+	../../print-bfd.o \
 	../../print-bgp.o \
 	../../print-bootp.o \
 	../../print-cdp.o \
@@ -82,7 +85,6 @@ OBJS = \
 	../../print-mobility.o \
 	../../print-mpls.o \
 	../../print-msdp.o \
-	../../print-netbios.o \
 	../../print-nfs.o \
 	../../print-ntp.o \
 	../../print-null.o \
@@ -122,8 +124,7 @@ OBJS = \
 	../../smbutil.o \
 	../../tcpdump.o \
 	../../util.o \
-	../../Win32/src/getopt.o \
-	../../Win32/Src/w32_fzs.o
+	../../Win32/src/getopt.o
 
 main: ${OBJS}
 	${CC} ${CFLAGS} ${LDFLAGS} -o windump.exe ${OBJS} ${LIBS}