osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Updates to reflect revision 4 of ethereal-win32-libs. 

svn path=/trunk/; revision=12305
This commit is contained in:
Gerald Combs 2004-10-15 18:30:05 +00:00
parent fee16ab377
commit 6c2fcd2c92
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.nmake
View File

@ -50,7 +50,7 @@ EXTRA_OBJECTS = \
ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib shell32.lib \
$(NET_SNMP_DIR)\win32\lib\netsnmp.lib \
$(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib \
!IFDEF ENABLE_LIBETHEREAL
epan\libethereal.lib \
!ELSE
@ -66,7 +66,7 @@ ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
tethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib \
$(GLIB_LIBS) \
$(NET_SNMP_DIR)\win32\lib\netsnmp.lib \
$(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib \
!IFDEF ENABLE_LIBETHEREAL
epan\libethereal.lib \
!ELSE
@ -93,7 +93,7 @@ mergecap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib \
$(GLIB_LIBS) \
$(NET_SNMP_DIR)\win32\lib\netsnmp.lib \
$(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib \
!IFDEF ENABLE_LIBETHEREAL
epan\libethereal.lib \
!ELSE
@ -108,7 +108,7 @@ dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
user32.lib \
$(GLIB_LIBS) \
$(NET_SNMP_DIR)\win32\lib\netsnmp.lib
$(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib
EXECUTABLES=ethereal.exe ethereal-gtk2.exe tethereal.exe \
capinfo.exe editcap.exe mergecap.exe text2pcap.exe

4
config.nmake
View File

@ -101,7 +101,7 @@ PCAP_DIR=$(ETHEREAL_LIBS)\WPdpack
# Set NET_SNMP_DIR to the pathname of the directory in which the
# Net-SNMP include files and library resides.
#
NET_SNMP_DIR=$(ETHEREAL_LIBS)\net-snmp-5.1
NET_SNMP_DIR=$(ETHEREAL_LIBS)\net-snmp-5.1.2
#
# If you have GNU ADNS, set this to the pathname of the directory in
@ -110,7 +110,7 @@ NET_SNMP_DIR=$(ETHEREAL_LIBS)\net-snmp-5.1
# If you don't have GNU ADNS, comment this line out, so that ADNS_DIR
# isn't defined.
#
ADNS_DIR=$(ETHEREAL_LIBS)\adns-1.0-win32-03
ADNS_DIR=$(ETHEREAL_LIBS)\adns-1.0-win32-04
#
# If you have the PCRE (Perl Compatible Regular Expressions) library,

2
epan/Makefile.nmake
View File

@ -23,7 +23,7 @@ libethereal_LIBS = \
$(PCRE_LIBS) \
$(NETTLE_LIBS) \
$(ZLIB_LIBS) \
$(NET_SNMP_DIR)\win32\lib\netsnmp.lib \
$(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib \
ftypes\ftypes.lib \
dfilter\dfilter.lib \
dissectors\dissectors.lib