Compile fix: update generated rnsap files
[obnox/wireshark/wip.git] / Makefile.nmake
index ef6bf13272cbf255869e4a48e4969c69273b1b81..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$
@@ -28,8 +28,8 @@ 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)
@@ -46,17 +46,17 @@ EXTRA_OBJECTS = \
        mkstemp.obj     \
        strptime.obj
 
-ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).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 HHC_DIR
        $(HHC_DIR)\lib\htmlhelp.lib \
 !ENDIF
-!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) \
@@ -65,15 +65,15 @@ ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
 !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) \
@@ -101,11 +101,11 @@ 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) \
@@ -118,10 +118,10 @@ 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 \
+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\dumpcap.res
 
@@ -151,29 +151,29 @@ $(RESOURCES): image
 wiretap\wiretap-$(WTAP_VERSION).lib: wiretap
 
 !IFNDEF GTK1_DIR
-ethereal.exe   : 
+wireshark.exe  : 
 !ELSE
-ethereal.exe   : config.h svnversion.h $(ethereal_OBJECTS) $(command_line_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) $(command_line_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) $(command_line_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 $(command_line_OBJECTS) wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res
@@ -230,7 +230,7 @@ config.h    : config.h.win32 config.nmake
            -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_BREAKLOOP@/$(PCAP_BREAKLOOP_CONFIG)/" \
-           -e "s/@HAVE_LIBETHEREALDLL@/$(LIBETHEREAL_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)/" \
@@ -261,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.
 #
@@ -275,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
@@ -287,7 +287,7 @@ 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 \
@@ -295,7 +295,7 @@ clean: gtk2_distclean
                AUTHORS-SHORT-FORMAT \
                dftest.obj dftest.exe randpkt.obj randpkt.ext dumpcap.obj \
                doxygen.cfg \
-               $(RESOURCES) libethereal.dll wiretap-$(WTAP_VERSION).dll
+               $(RESOURCES) libwireshark.dll wiretap-$(WTAP_VERSION).dll
        cd asn1
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ..
@@ -459,157 +459,157 @@ 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.8"
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                glib gtk2.8/glib-2.8.4-20051212.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(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 "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                glib gtk2.6/glib-2.6.6.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(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 "$(ETHEREAL_LIBS)" \
+       @$(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)" \
+       @$(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)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                . WpdPack_3_1.zip
 !ENDIF
 !IFDEF ADNS_DIR
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(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)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                pcre-6.4 pcre-6.4-bin.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(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)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                zlib123-dll zlib123-dll.zip
 !ENDIF
 !IFDEF LUA_DIR
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                . lua5_1_vc6.zip
 !ENDIF
 !IFDEF GTK2_DIR
 !IF "$(GTK2_INST_VERSION)" == "2.8"
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/gtk+-2.8.9.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/gtk+-dev-2.8.9.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/cairo-1.0.2.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/cairo-dev-1.0.2.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/atk-1.10.3.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/atk-dev-1.10.3.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(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 "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.6/gtk+-2.6.9.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.6/gtk+-dev-2.6.9.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.6/atk-1.9.0.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(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 "$(ETHEREAL_LIBS)" \
+       @$(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.10"
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/pango-1.10.1.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(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 "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.6/pango-1.8.2.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(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 "$(ETHEREAL_LIBS)" \
+       @$(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)" \
+       @$(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)/zlib123-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)ethereal directly from there.
+# Prepare the source tree for running (t)wireshark directly from there.
 ################################################################################
 
-# "install-deps" will copy all dlls needed to run (t)ethereal
-# to the source tree, so you can run (t)ethereal directly from there.
-# Note that the gtk2 version of ethereal is called ethereal-gtk2.exe
+# "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
@@ -660,8 +660,8 @@ install-gtk1-deps: install-required-deps
 install-required-deps:
        set copycmd=/y
        xcopy wiretap\wiretap-$(WTAP_VERSION).dll . /d
-!IFDEF ENABLE_LIBETHEREAL
-       xcopy epan\libethereal.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