"ssn_range" needs to be a copy of "global_ssn_range", so that it's not

[obnox/wireshark/wip.git] / Makefile.nmake

diff --git a/Makefile.nmake b/Makefile.nmake
index d7286a0ca6795d17863a84fcaf8d77783c6322fc..db2d240dfd22affe65f85adfa349a46779b5630c 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -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
@@ -206,6 +206,7 @@ config.h    : config.h.win32 config.nmake
        sed -e s/@VERSION@/$(VERSION)/ \
            -e "s/@HAVE_GNU_ADNS@/$(ADNS_CONFIG)/" \
            -e "s/@HAVE_PCRE@/$(PCRE_CONFIG)/" \
+           -e "s/@HAVE_NETTLE@/$(NETTLE_CONFIG)/" \
            -e "s/@HAVE_LIBZ@/$(ZLIB_CONFIG)/" \
            -e "s/@HAVE_LIBPCAP@/$(WINPCAP_CONFIG)/" \
            -e "s/@HAVE_PCAP_FINDALLDEVS@/$(PCAP_FINDALLDEVS_CONFIG)/" \
@@ -390,9 +391,9 @@ verify_tools:
 setup: verify_tools
 !IF "$(GTK2_INST_VERSION)" == "2.4"
        @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
-               glib gtk2.4/glib-2.4.5-20040903.zip
+               glib gtk2.4/glib-2.4.7.zip
        @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
-               glib gtk2.4/glib-dev-2.4.5.zip
+               glib gtk2.4/glib-dev-2.4.7.zip
 !ELSE
        @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
                glib glib-2.2.3-20040116.zip
@@ -411,7 +412,7 @@ setup: verify_tools
                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.zip
+               . net-snmp-5.1.2.zip
 !ENDIF
 !IFDEF PCAP_DIR
        @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
@@ -419,7 +420,7 @@ setup: verify_tools
 !ENDIF
 !IFDEF ADNS_DIR
        @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
-               . adns-1.0-win32-03.zip
+               . adns-1.0-win32-04.zip
 !ENDIF
 !IFDEF PCRE_DIR
        @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \