Compile fix: update generated rnsap files
[obnox/wireshark/wip.git] / Makefile.nmake
index 8c681ac33a3b432c02c16adc5a60ed2613ee7e4a..326e0fb150cbfe522a9a8769d53ab85ef87e360c 100644 (file)
@@ -1,4 +1,4 @@
-## Makefile for building ethereal.exe with Microsoft C and nmake
+## Makefile for building wireshark.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
 # $Id$
@@ -16,24 +16,29 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GLIB_CFLAGS) /I. /Iwiretap \
        $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include \
        /I$(NET_SNMP_DIR)\include /I$(NET_SNMP_DIR)\win32 \
-       $(ADNS_CFLAGS) $(PCRE_CFLAGS) -D_U_="" -D_NEED_VAR_IMPORT_
+       $(ADNS_CFLAGS) $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) $(LUA_CFLAGS) \
+       -D_U_="" -D_NEED_VAR_IMPORT_
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 
 .c.obj::
        $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
 
-PLATFORM_SRC = capture-wpcap.c
+PLATFORM_SRC = capture-wpcap.c capture_wpcap_packet.c
 
 include Makefile.common
 
-ethereal_OBJECTS = $(ethereal_SOURCES:.c=.obj)
-tethereal_OBJECTS = $(tethereal_SOURCES:.c=.obj)
+wireshark_OBJECTS = $(wireshark_SOURCES:.c=.obj)
+tshark_OBJECTS = $(tshark_SOURCES:.c=.obj)
 dftest_OBJECTS = $(dftest_SOURCES:.c=.obj)
 
+dumpcap_OBJECTS = $(dumpcap_SOURCES:.c=.obj)
+
 randpkt_OBJECTS = $(randpkt_SOURCES:.c=.obj)
 
-command_line_OBJECTS = setargv.obj
+command_line_OBJECTS = 
+
+#setargv.obj
 
 EXTRA_OBJECTS = \
 #      snprintf.obj    \
@@ -41,34 +46,39 @@ EXTRA_OBJECTS = \
        mkstemp.obj     \
        strptime.obj
 
-ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
-       wsock32.lib user32.lib shell32.lib \
+wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
+       wsock32.lib user32.lib shell32.lib comctl32.lib \
        $(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib \
-!IFDEF ENABLE_LIBETHEREAL
-       epan\libethereal.lib \
+!IFDEF HHC_DIR
+       $(HHC_DIR)\lib\htmlhelp.lib \
+!ENDIF
+!IFDEF ENABLE_LIBWIRESHARK
+       epan\libwireshark.lib \
 !ELSE
        epan\dissectors\dissectors.lib \
-       epan\ethereal.lib \
+       epan\wireshark.lib \
        epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
        $(ADNS_LIBS) \
        $(PCRE_LIBS) \
-       $(ZLIB_LIBS)
+       $(ZLIB_LIBS) \
+       $(GNUTLS_LIBS) 
 !ENDIF
 #      $(PCAP_DIR)\lib\wpcap.lib
 
-tethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
+tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
        wsock32.lib user32.lib \
        $(GLIB_LIBS) \
        $(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib \
-!IFDEF ENABLE_LIBETHEREAL
-       epan\libethereal.lib \
+!IFDEF ENABLE_LIBWIRESHARK
+       epan\libwireshark.lib \
 !ELSE
        epan\dissectors\dissectors.lib \
-       epan\ethereal.lib \
+       epan\wireshark.lib \
        epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
        $(ADNS_LIBS) \
        $(PCRE_LIBS) \
-       $(ZLIB_LIBS)
+       $(ZLIB_LIBS) \
+       $(GNUTLS_LIBS)
 !ENDIF
 
 capinfos_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
@@ -83,19 +93,24 @@ mergecap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
        wsock32.lib user32.lib \
        $(GLIB_LIBS)
 
+dumpcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
+       wsock32.lib user32.lib \
+       $(GLIB_LIBS)
+
 dftest_LIBS=  wiretap\wiretap-$(WTAP_VERSION).lib \
        wsock32.lib user32.lib \
        $(GLIB_LIBS) \
        $(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib \
-!IFDEF ENABLE_LIBETHEREAL
-       epan\libethereal.lib \
+!IFDEF ENABLE_LIBWIRESHARK
+       epan\libwireshark.lib \
 !ELSE
        epan\dissectors\dissectors.lib \
-       epan\ethereal.lib \
+       epan\wireshark.lib \
        epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
        $(ADNS_LIBS) \
        $(PCRE_LIBS) \
-       $(ZLIB_LIBS)    
+       $(ZLIB_LIBS) \
+       $(GNUTLS_LIBS)  
 !ENDIF
 
 randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
@@ -103,12 +118,12 @@ randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
        $(GLIB_LIBS) \
        $(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib
 
-EXECUTABLES=ethereal.exe ethereal-gtk2.exe tethereal.exe \
-       capinfos.exe editcap.exe mergecap.exe text2pcap.exe
+EXECUTABLES=wireshark.exe wireshark-gtk2.exe tshark.exe \
+       capinfos.exe editcap.exe mergecap.exe text2pcap.exe randpkt.exe dumpcap.exe
 
-RESOURCES=image\ethereal.res image\libethereal.res image\tethereal.res \
+RESOURCES=image\wireshark.res image\libwireshark.res image\tshark.res \
        image\capinfos.res image\editcap.res image\mergecap.res \
-       image\text2pcap.res image\wiretap.res
+       image\text2pcap.res image\wiretap.res image\dumpcap.res
 
 all: config.h tools image wiretap epan $(EXECUTABLES) $(RESOURCES) doc
 
@@ -136,65 +151,74 @@ $(RESOURCES): image
 wiretap\wiretap-$(WTAP_VERSION).lib: wiretap
 
 !IFNDEF GTK1_DIR
-ethereal.exe   : 
+wireshark.exe  : 
 !ELSE
-ethereal.exe   : config.h svnversion.h $(ethereal_OBJECTS) epan gtk image\ethereal.res wiretap\wiretap-$(WTAP_VERSION).lib gtk\libui.lib plugins
+wireshark.exe  : config.h svnversion.h $(wireshark_OBJECTS) $(command_line_OBJECTS) epan gtk image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib gtk\libui.lib plugins
        @echo Linking $@
        $(LINK) @<<
-               /OUT:ethereal.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(ethereal_LIBS) $(GTK1_LIBS) gtk\libui.lib $(ethereal_OBJECTS) image\ethereal.res
+               /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK1_LIBS) gtk\libui.lib $(wireshark_OBJECTS) image\wireshark.res
 <<
 !ENDIF
 
 !IFNDEF GTK2_DIR
-ethereal-gtk2.exe      : 
+wireshark-gtk2.exe     : 
 !ELSE
-ethereal-gtk2.exe      : config.h svnversion.h $(ethereal_OBJECTS) epan gtk2 image\ethereal.res wiretap\wiretap-$(WTAP_VERSION).lib gtk2.tmp\libui.lib plugins
+wireshark-gtk2.exe     : config.h svnversion.h $(wireshark_OBJECTS) $(command_line_OBJECTS) epan gtk2 image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib gtk2.tmp\libui.lib plugins
        @echo Linking $@
        $(LINK) @<<
-               /OUT:ethereal-gtk2.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(ethereal_LIBS) $(GTK2_LIBS) gtk2.tmp\libui.lib $(ethereal_OBJECTS) image\ethereal.res
+               /OUT:wireshark-gtk2.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK2_LIBS) gtk2.tmp\libui.lib $(wireshark_OBJECTS) image\wireshark.res
 <<
 !ENDIF
 
-tethereal.exe  : config.h svnversion.h $(tethereal_OBJECTS) epan image\tethereal.res wiretap\wiretap-$(WTAP_VERSION).lib plugins
+tshark.exe     : config.h svnversion.h $(tshark_OBJECTS) $(command_line_OBJECTS) epan image\tshark.res wiretap\wiretap-$(WTAP_VERSION).lib plugins
        @echo Linking $@
        $(LINK) @<<
-               /OUT:tethereal.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(tethereal_LIBS) $(tethereal_OBJECTS) $(command_line_OBJECTS) image\tethereal.res
+               /OUT:tshark.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(tshark_LIBS) $(tshark_OBJECTS) $(command_line_OBJECTS) image\tshark.res
 <<
 
-capinfos.exe   : config.h capinfos.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res
+capinfos.exe   : config.h capinfos.obj getopt.obj $(command_line_OBJECTS) wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res
        @echo Linking $@
        $(LINK) @<<
                /OUT:capinfos.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console capinfos.obj getopt.obj $(command_line_OBJECTS) $(capinfos_LIBS) image\capinfos.res
 <<
 
-editcap.exe    : config.h editcap.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res
+editcap.exe    : config.h editcap.obj getopt.obj strptime.obj wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res
        @echo Linking $@
        $(LINK) @<<
-               /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj $(command_line_OBJECTS) $(editcap_LIBS) image\editcap.res
+               /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj strptime.obj $(command_line_OBJECTS) $(editcap_LIBS) image\editcap.res
 <<
 
-mergecap.exe   : config.h svnversion.h mergecap.obj merge.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\mergecap.res
+mergecap.exe   : config.h svnversion.h mergecap.obj merge.obj getopt.obj $(command_line_OBJECTS) wiretap\wiretap-$(WTAP_VERSION).lib image\mergecap.res
        @echo Linking $@
        $(LINK) @<<
                /OUT:mergecap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console mergecap.obj merge.obj getopt.obj $(command_line_OBJECTS) $(mergecap_LIBS) image\mergecap.res
 <<
 
-text2pcap.exe  : config.h text2pcap.obj text2pcap-scanner.obj getopt.obj strptime.obj image\text2pcap.res
+text2pcap.exe  : config.h text2pcap.obj text2pcap-scanner.obj getopt.obj strptime.obj $(command_line_OBJECTS) image\text2pcap.res
        @echo Linking $@
        $(LINK) @<<
                /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console text2pcap.obj text2pcap-scanner.obj getopt.obj strptime.obj $(command_line_OBJECTS) image\text2pcap.res
 <<
 
 dftest.exe     : $(dftest_OBJECTS) epan
+       @echo Linking $@
        $(LINK) @<<
                /OUT:dftest.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dftest_LIBS) $(dftest_OBJECTS)
 <<
 
-randpkt.exe    : $(randpkt_OBJECTS)
+randpkt.exe    : $(randpkt_OBJECTS) $(command_line_OBJECTS)
+       @echo Linking $@
        $(LINK) @<<
                /OUT:randpkt.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(randpkt_LIBS) $(randpkt_OBJECTS) $(command_line_OBJECTS)
 <<
 
+dumpcap.exe    : config.h svnversion.h $(dumpcap_OBJECTS) getopt.obj mkstemp.obj $(command_line_OBJECTS) wiretap\wiretap-$(WTAP_VERSION).lib image\dumpcap.res 
+       @echo Linking $@
+       $(LINK) @<<
+               /OUT:dumpcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dumpcap_LIBS) $(dumpcap_OBJECTS) getopt.obj mkstemp.obj $(command_line_OBJECTS) image\dumpcap.res
+<<
+
+
 config.h       : config.h.win32 config.nmake
        sed -e s/@VERSION@/$(VERSION)/ \
            -e "s/@HAVE_GNU_ADNS@/$(ADNS_CONFIG)/" \
@@ -205,9 +229,12 @@ config.h   : config.h.win32 config.nmake
            -e "s/@HAVE_PCAP_FINDALLDEVS@/$(PCAP_FINDALLDEVS_CONFIG)/" \
            -e "s/@HAVE_PCAP_DATALINK_NAME_TO_VAL@/$(PCAP_DATALINK_NAME_TO_VAL_CONFIG)/" \
            -e "s/@HAVE_PCAP_DATALINK_VAL_TO_NAME@/$(PCAP_DATALINK_VAL_TO_NAME_CONFIG)/" \
-           -e "s/@HAVE_PCAP_LIB_VERSION@/$(PCAP_LIB_VERSION_CONFIG)/" \
-           -e "s/@HAVE_LIBETHEREALDLL@/$(LIBETHEREAL_CONFIG)/" \
+           -e "s/@HAVE_PCAP_BREAKLOOP@/$(PCAP_BREAKLOOP_CONFIG)/" \
+           -e "s/@HAVE_LIBWIRESHARKDLL@/$(LIBWIRESHARK_CONFIG)/" \
            -e "s/@WPCAP_CONSTIFIED@/$(WPCAP_CONSTIFIED_CONFIG)/" \
+           -e "s/@HAVE_GNUTLS@/$(GNUTLS_CONFIG)/" \
+           -e "s/@HAVE_LUA@/$(LUA_CONFIG)/" \
+           -e "s/@HAVE_LUA_5_1@/$(LUA_VERSION)/" \
            < config.h.win32 > $@
 
 ps.c   : rdps.exe print.ps
@@ -234,7 +261,7 @@ AUTHORS-SHORT-FORMAT: AUTHORS-SHORT make-authors-format.pl
     $(PERL) perlnoutf.pl make-authors-format.pl < AUTHORS-SHORT > AUTHORS-SHORT-FORMAT
 
 #
-# Build "tethereal-tap-register.c", which contains a function 
+# Build "tshark-tap-register.c", which contains a function 
 # "register_all_tap_listeners()"
 # that calls the register routines for all tehtereal tap listeners.
 #
@@ -248,9 +275,9 @@ AUTHORS-SHORT-FORMAT: AUTHORS-SHORT make-authors-format.pl
 # The second argument is the directory in which the source files live.
 # All subsequent arguments are the files to scan.
 #
-tethereal-tap-register.c: $(TETHEREAL_TAP_SRC) make-tapreg-dotc
-       @echo Making tethereal-tap-register.c
-       @$(SH) make-tapreg-dotc tethereal-tap-register.c . $(TETHEREAL_TAP_SRC)
+tshark-tap-register.c: $(TSHARK_TAP_SRC) make-tapreg-dotc
+       @echo Making tshark-tap-register.c
+       @$(SH) make-tapreg-dotc tshark-tap-register.c . $(TSHARK_TAP_SRC)
 
 text2pcap-scanner.c : text2pcap-scanner.l
        $(LEX) -otext2pcap-scanner.c text2pcap-scanner.l
@@ -260,14 +287,18 @@ gtk2_distclean:
        if exist gtk2.tmp rmdir gtk2.tmp
 
 clean: gtk2_distclean
-       rm -f $(ethereal_OBJECTS) $(tethereal_OBJECTS) $(EXTRA_OBJECTS) \
+       rm -f $(wireshark_OBJECTS) $(tshark_OBJECTS) $(EXTRA_OBJECTS) \
                $(EXECUTABLES) $(PDB_FILE) \
                capinfos.obj editcap.obj mergecap.obj text2pcap.obj getopt.obj\
                text2pcap-scanner.obj text2pcap-scanner.c rdps.obj \
                rdps.pdb rdps.exe rdps.ilk config.h ps.c AUTHORS-SHORT \
                AUTHORS-SHORT-FORMAT \
-               dftest.obj dftest.exe randpkt.obj randpkt.ext doxygen.cfg \
-               $(RESOURCES)
+               dftest.obj dftest.exe randpkt.obj randpkt.ext dumpcap.obj \
+               doxygen.cfg \
+               $(RESOURCES) libwireshark.dll wiretap-$(WTAP_VERSION).dll
+       cd asn1
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+       cd ..
        cd wiretap
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ../gtk
@@ -361,9 +392,10 @@ gtk:: help config.h svnversion.h AUTHORS-SHORT doxygen
 gtk2:: help config.h svnversion.h AUTHORS-SHORT
        if not exist gtk2.tmp mkdir gtk2.tmp
        cd gtk
-       xcopy Makefile.* ..\gtk2.tmp /d /y
-       xcopy *.c        ..\gtk2.tmp /d /y
-       xcopy *.h        ..\gtk2.tmp /d /y
+       set copycmd=/y
+       xcopy Makefile.* ..\gtk2.tmp /d
+       xcopy *.c        ..\gtk2.tmp /d
+       xcopy *.h        ..\gtk2.tmp /d
        cd ..\gtk2.tmp
        $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake GTK_CFLAGS="$(GTK2_CFLAGS)" GTK_LIBS="$(GTK2_LIBS)" libui.lib
        cd ..
@@ -399,10 +431,23 @@ doxygen-run:
 
 doxygen: doxygen.cfg doxygen-run
 
+################################################################################
+# Prepare build environment by downloading and installing required libraries
+################################################################################
+
+# The required tools to build Ethereal.
+#
+# The 'find' tool is available both in \WINNT\System32 and in cygwin's /usr/bin.
+# We only need the cygwin version (for some shell scripts).
+# In the PATH, System32 is before cygwin's dir, so explicitly check for /usr/bin/find.
 REQUIRED_TOOLS=\
+       $(CC) \
+       $(LINK) \
+       nmake \
        $(SH)   \
        $(YACC) \
        $(LEX)  \
+       env     \
        grep    \
        /usr/bin/find   \
        $(PERL) \
@@ -414,97 +459,230 @@ REQUIRED_TOOLS=\
 verify_tools:
        @$(SH) tools\win32-setup.sh --appverify $(REQUIRED_TOOLS)
 
-# Download and install all the required libraries into ETHEREAL_LIBS.
+# Download and install all the required libraries into WIRESHARK_LIBS.
 # If you used this setup target before, consider doing a clean_setup.
 setup: verify_tools
-!IF "$(GTK2_INST_VERSION)" == "2.4"
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+!IF "$(GTK2_INST_VERSION)" == "2.8"
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               glib gtk2.8/glib-2.8.4-20051212.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               glib gtk2.8/glib-dev-2.8.4-20051212.zip
+!ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               glib gtk2.6/glib-2.6.6.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               glib gtk2.6/glib-dev-2.6.6.zip
+!ELSEIF "$(GTK2_INST_VERSION)" == "2.4"
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                glib gtk2.4/glib-2.4.7.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                glib gtk2.4/glib-dev-2.4.7.zip
 !ELSE
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                glib glib-2.2.3-20040116.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                glib glib-dev-2.2.3-20040116.zip
 !ENDIF
 !IFDEF GTK1_DIR
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk+ gtk+-1.3.0-20030717.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk+ gtk+-dev-1.3.0-20030115.zip
 !ENDIF
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                libiconv-1.9.1.bin.woe32 libiconv-1.9.1.bin.woe32.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gettext-runtime-0.13.1 gettext-runtime-0.13.1.zip
 !IFDEF NET_SNMP_DIR
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
-               . net-snmp-5.1.2.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               . net-snmp-5.2.2.zip
 !ENDIF
 !IFDEF PCAP_DIR
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
-               . wpdpack_3_0.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               . WpdPack_3_1.zip
 !ENDIF
 !IFDEF ADNS_DIR
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
-               . adns-1.0-win32-04.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               . adns-1.0-win32-05.zip
 !ENDIF
 !IFDEF PCRE_DIR
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
-               . pcre-4.4.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               pcre-6.4 pcre-6.4-bin.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               pcre-6.4 pcre-6.4-lib.zip
 !ENDIF
 !IFDEF ZLIB_DIR
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
-               zlib122-dll zlib122-dll.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               zlib123-dll zlib123-dll.zip
+!ENDIF
+!IFDEF LUA_DIR
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               . lua5_1_vc6.zip
 !ENDIF
 !IFDEF GTK2_DIR
-!IF "$(GTK2_INST_VERSION)" == "2.4"
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+!IF "$(GTK2_INST_VERSION)" == "2.8"
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.8/gtk+-2.8.9.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.8/gtk+-dev-2.8.9.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.8/cairo-1.0.2.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.8/cairo-dev-1.0.2.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.8/atk-1.10.3.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.8/atk-dev-1.10.3.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.8/libpng-1.2.8-bin.zip
+!ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.6/gtk+-2.6.9.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.6/gtk+-dev-2.6.9.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.6/atk-1.9.0.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.6/atk-dev-1.9.0.zip
+!ELSEIF "$(GTK2_INST_VERSION)" == "2.4"
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.4/gtk+-2.4.14.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.4/gtk+-dev-2.4.14.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.4/atk-1.6.0.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.4/atk-dev-1.6.0.zip
 !ELSE
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2/gtk+-2.2.4-20040124.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2/gtk+-dev-2.2.4-20040124.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2/atk-1.4.0.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2/atk-dev-1.4.0.zip
 !ENDIF
-!IF "$(PANGO_INST_VERSION)" == "1.4"
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+!IF "$(PANGO_INST_VERSION)" == "1.10"
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.8/pango-1.10.1.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.8/pango-dev-1.10.1.zip
+!ELSEIF "$(PANGO_INST_VERSION)" == "1.8"
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.6/pango-1.8.2.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.6/pango-dev-1.8.2.zip
+!ELSEIF "$(PANGO_INST_VERSION)" == "1.4"
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.4/pango-1.4.1.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.4/pango-dev-1.4.1.zip
 !ELSE
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2/pango-1.2.5-20040124.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2/pango-dev-1.2.5-20040124.zip
 !ENDIF
 !ENDIF
 !IFDEF GTK_WIMP_DIR
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
-               gtk-wimp gtk-wimp/gtk-wimp-0.6.2-bin.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk-wimp gtk-wimp/gtk-wimp-0.7.0-bin.zip
 !ENDIF
        @echo.
-       @echo Ethereal is ready to build.
+       @echo Wireshark is ready to build.
 
 # Cleanup files installed by the setup target. It will not remove the 
 # downloaded zip files.
 clean_setup:
-    rm -r -f $(ETHEREAL_LIBS)/glib
-    rm -r -f $(ETHEREAL_LIBS)/gtk+
-    rm -r -f $(ETHEREAL_LIBS)/libiconv-1.9.1.bin.woe32
-    rm -r -f $(ETHEREAL_LIBS)/gettext-runtime-0.13.1
-    rm -r -f $(ETHEREAL_LIBS)/zlib122-dll
-    rm -r -f $(ETHEREAL_LIBS)/gtk2
-    rm -r -f $(ETHEREAL_LIBS)/gtk-wimp
+    rm -r -f $(WIRESHARK_LIBS)/glib
+    rm -r -f $(WIRESHARK_LIBS)/gtk+
+    rm -r -f $(WIRESHARK_LIBS)/libiconv-1.9.1.bin.woe32
+    rm -r -f $(WIRESHARK_LIBS)/gettext-runtime-0.13.1
+    rm -r -f $(WIRESHARK_LIBS)/zlib123-dll
+    rm -r -f $(WIRESHARK_LIBS)/gtk2
+    rm -r -f $(WIRESHARK_LIBS)/gtk-wimp
+
+################################################################################
+# Prepare the source tree for running (t)wireshark directly from there.
+################################################################################
+
+# "install-deps" will copy all dlls needed to run (t)wireshark
+# to the source tree, so you can run (t)wireshark directly from there.
+# Note that the gtk2 version of wireshark is called wireshark-gtk2.exe
+
+install-deps: clean-deps install-gtk1-deps install-gtk2-deps
+       cd plugins
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-plugins
+       cd ..
+
+install-gtk2-deps: install-required-deps
+!IFDEF GTK2_DIR
+       set copycmd=/y
+       xcopy $(GTK2_DIR)\bin\libgdk-win32-2.0-0.dll . /d
+       xcopy $(GTK2_DIR)\bin\libgdk_pixbuf-2.0-0.dll . /d
+       xcopy $(GTK2_DIR)\bin\libgtk-win32-2.0-0.dll . /d
+       xcopy $(GTK2_DIR)\bin\libatk-1.0-0.dll . /d
+       xcopy $(GTK2_DIR)\bin\libpango-1.0-0.dll . /d
+       xcopy $(GTK2_DIR)\bin\libpangowin32-1.0-0.dll . /d
+       mkdir etc
+       mkdir etc\gtk-2.0
+       mkdir etc\pango
+       mkdir lib
+       mkdir lib\gtk-2.0
+       mkdir lib\gtk-2.0\$(GTK2_LIB_DIR)
+       mkdir lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders
+       mkdir lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules
+       mkdir lib\pango
+       mkdir lib\pango\$(PANGO_LIB_DIR)
+       mkdir lib\pango\$(PANGO_LIB_DIR)\modules
+       xcopy $(GTK2_DIR)\etc\gtk-2.0\*.* etc\gtk-2.0 /d
+       xcopy $(GTK2_DIR)\etc\pango\pango.* etc\pango /d
+       xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders\libpixbufloader-*.dll lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders /d
+       xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\im-*.dll lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules /d
+       xcopy $(GTK2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules\pango-*.dll lib\pango\$(PANGO_LIB_DIR)\modules /d
+!IFDEF NEED_LIBPNG_DLL
+       xcopy $(GTK2_DIR)\bin\libpng13.dll . /d
+!ENDIF
+!IFDEF NEED_CAIRO_DLL
+       xcopy $(GTK2_DIR)\bin\libcairo-2.dll . /d
+       xcopy $(GTK2_DIR)\bin\libpangocairo-1.0-0.dll . /d
+!ENDIF
+!ENDIF
+
+install-gtk1-deps: install-required-deps
+!IFDEF GTK1_DIR
+       set copycmd=/y
+       xcopy $(GTK1_DIR)\lib\libgtk-0.dll . /d
+       xcopy $(GTK1_DIR)\lib\libgdk-0.dll . /d
+!ENDIF
+
+install-required-deps:
+       set copycmd=/y
+       xcopy wiretap\wiretap-$(WTAP_VERSION).dll . /d
+!IFDEF ENABLE_LIBWIRESHARK
+       xcopy epan\libwireshark.dll . /d
+!ENDIF
+       xcopy $(GLIB_DIR)\bin\libglib-2.0-0.dll . /d
+       xcopy $(GLIB_DIR)\bin\libgmodule-2.0-0.dll . /d
+       xcopy $(GLIB_DIR)\bin\libgobject-2.0-0.dll . /d
+       xcopy $(ICONV_DIR)\bin\iconv.dll . /d
+       xcopy $(GETTEXT_DIR)\bin\intl.dll . /d
+!IFDEF ZLIB_DIR
+       xcopy $(ZLIB_DIR)\zlib1.dll . /d
+!ENDIF
+!IFDEF ADNS_DIR
+       xcopy $(ADNS_DIR)\adns_win32\LIB\adns_dll.dll . /d
+!ENDIF
+!IFDEF PCRE_DIR
+       xcopy $(PCRE_DIR)\bin\pcre.dll . /d
+!ENDIF
+
+clean-deps:
+       rm -f *.dll
+       rm -rf etc
+       rm -rf lib
+       cd plugins
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean-deps
+       cd ..