git.samba.org / obnox / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix for bug 3079:
[obnox/wireshark/wip.git] / Makefile.nmake
diff --git a/Makefile.nmake b/Makefile.nmake
index d3ddf2c8c288d1dd9e4dc8e2f6f2e75274d2bef4..a4750464e27abdcdc98965666982e73f34a090c5 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -3,6 +3,9 @@
 #
 # $Id$
 
+# We "Deploy using XCopy," which is described at
+# http://msdn.microsoft.com/en-us/library/ms235291.aspx
+
 include config.nmake
 include <win32.mak>
 
@@ -241,6 +244,9 @@ rawshark.exe        : $(LIBS_CHECK) config.h svnversion.h $(rawshark_OBJECTS) getopt.ob
        $(LINK) @<<
                /OUT:rawshark.exe $(conflags) $(conlibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console $(rawshark_LIBS) $(rawshark_OBJECTS) getopt.obj inet_ntop.obj image\rawshark.res
 <<
+!IF $(MSC_VER_REQUIRED) >= 1400
+       mt.exe -nologo -manifest "rawshark.exe.manifest" -outputresource:rawshark.exe;1
+!ENDIF
 
 # XXX: This makefile does not properly handle doing a 'nmake ... capinfos.exe' directly since some of the .objs
 #      (e.g. epan\plugins.obj) must be built first using epan\Makefile.nmake (which happens for 'nmake ... all').
@@ -551,7 +557,7 @@ $(ADNS_DLL):
        copy adns_dll.rc adns.tmp\adns_win32\adns_dll
        cd adns.tmp\adns_win32\adns_dll
        set CFG=adns_dll - Win32 Release
-       $(MAKE) /$(MAKEFLAGS) -f adns_dll.mak LOC="-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE"
+       $(MAKE) /$(MAKEFLAGS) -f adns_dll.mak LOC="$(LOCAL_CFLAGS)"
        cd ..\lib
 !IF $(MSC_VER_REQUIRED) >= 1400
        mt.exe -nologo -manifest "adns_dll.dll.manifest" -outputresource:adns_dll.dll;2
@@ -572,7 +578,7 @@ $(ADNS_DLL):
 $(ZLIB_DLL):
        xcopy $(ZLIB_DIR) zlib.tmp /D /I /E /Y
        cd zlib.tmp
-       $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll LOC="-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE"
+       $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll LOC="$(LOCAL_CFLAGS)"
        if not exist $(ZLIB_DIR) mkdir $(ZLIB_DIR)
        if not exist $(ZLIB_DIR)\lib mkdir $(ZLIB_DIR)\lib
        if not exist $(ZLIB_DIR)\include mkdir $(ZLIB_DIR)\include
@@ -584,7 +590,7 @@ $(ZLIB_DLL):
        copy zconf.h $(ZLIB_DIR)\include
        copy zlib.h $(ZLIB_DIR)\include
        cd ..
-    rm -r -f zlib.tmp
+       rm -r -f zlib.tmp
 !ENDIF
 
 wsutil::
@@ -682,10 +688,12 @@ check_libs:
 #  (or dummy file doesn't exist because of 'make clean' or whatever)
 # (To disable library verification when Makefile.nmake changes,
 #  comment out the commands for the following target).
-# touch is only called if libverify succeeds
+# touch is only called if libverify succeeds.
+#  (One microsec is added to the makefile.nmake time since the time set by [cygwin ?] 'touch --reference' 
+#   apparently has the nanosecs truncated from the reference file time [at least on Windows Vista]).
 $(LIBS_CHECK): Makefile.nmake
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake WIN32_SETUP_OPT=--libverify process_libs
-       @touch --reference=Makefile.nmake $@
+       @touch --reference=Makefile.nmake -d "+0.000001 sec" $@
 
 # Download (if needed) and install all the required libraries into WIRESHARK_LIBS.
 # A clean_setup is done first to ensure that the target dirs don't
@@ -702,9 +710,9 @@ process_libs:
     if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
 !IF "$(GTK_INST_VERSION)" == "2.14"
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               glib gtk2.14/glib_2.18.0-2_win32.zip
+               glib gtk2.14/glib_2.18.2-1_win32.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               glib gtk2.14/glib-dev_2.18.0-2_win32.zip
+               glib gtk2.14/glib-dev_2.18.2-1_win32.zip
 !ELSEIF "$(GTK_INST_VERSION)" == "2.12"
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
                glib gtk2.12/glib_2.18.0-1_win32.zip
@@ -733,7 +741,7 @@ process_libs:
 !ENDIF
 !IFDEF C_ARES_DIR
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               . c-ares-1.5.2ws.zip
+               . c-ares-1.5.3ws.zip
 !ENDIF
 !IFDEF ADNS_DIR
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@@ -751,7 +759,7 @@ process_libs:
 !ENDIF
 !IFDEF LUA_DIR
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               . lua5_1_dll.zip
+               lua5.1.4 lua5_1_4_Win32_dll9_lib.zip
 !ENDIF
 
 !IFDEF GNUTLS_DIR
@@ -770,19 +778,19 @@ process_libs:
 !IFDEF GTK_DIR
 !IF "$(GTK_INST_VERSION)" == "2.14"
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.14/gtk+_2.14.1-1_win32.zip
+               gtk2 gtk2.14/gtk+_2.14.4-2_win32.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.14/gtk+-dev_2.14.1-1_win32.zip
+               gtk2 gtk2.14/gtk+-dev_2.14.4-2_win32.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.14/cairo-1.6.4-2.zip
+               gtk2 gtk2.14/cairo_1.8.0-1_win32.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.14/cairo-dev-1.6.4-2.zip
+               gtk2 gtk2.14/cairo-dev_1.8.0-1_win32.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.14/atk-1.22.0.zip
+               gtk2 gtk2.14/atk_1.24.0-1_win32.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.14/atk-dev-1.22.0.zip
+               gtk2 gtk2.14/atk-dev_1.24.0-1_win32.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.14/libpng-1.2.29.zip
+               gtk2 gtk2.14/libpng_1.2.32-1_win32.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.14/tiff-3.8.2-1-bin.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@@ -809,11 +817,11 @@ process_libs:
 !ELSE
 !ERROR ? Unknown or invalid GTK_INST_VERSION
 !ENDIF
-!IF "$(PANGO_INST_VERSION)" == "1.20"
+!IF "$(PANGO_INST_VERSION)" == "1.22"
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.12/pango-1.20.5.zip
+               gtk2 gtk2.14/pango_1.22.0-1_win32.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.12/pango-dev-1.20.5.zip
+               gtk2 gtk2.14/pango-dev_1.22.0-1_win32.zip
 !ELSE
 !ERROR ? Unknown or invalid PANGO_INST_VERSION
 !ENDIF
@@ -842,7 +850,7 @@ process_libs:
 # UPDATING REMOVES THE FORMER USER DIRS
 clean_setup:
     rm -r -f $(WIRESHARK_LIBS)/adns-1.0-win32-05ws
-    rm -r -f $(WIRESHARK_LIBS)/c-ares-1.5.2ws
+    rm -r -f $(WIRESHARK_LIBS)/c-ares-1.5.3ws
     rm -r -f $(WIRESHARK_LIBS)/gettext-0.14.5
     rm -r -f $(WIRESHARK_LIBS)/gettext-runtime-0.17
     rm -r -f $(WIRESHARK_LIBS)/gettext-runtime-0.17-1
@@ -855,6 +863,7 @@ clean_setup:
     rm -r -f $(WIRESHARK_LIBS)/kfw-2.5
     rm -r -f $(WIRESHARK_LIBS)/libiconv-1.9.1.bin.woe32
     rm -r -f $(WIRESHARK_LIBS)/lua5.1
+    rm -r -f $(WIRESHARK_LIBS)/lua5.1.4
     rm -r -f $(WIRESHARK_LIBS)/libsmi-0.4.5
     rm -r -f $(WIRESHARK_LIBS)/libsmi-0.4.8
     rm -r -f $(WIRESHARK_LIBS)/nasm-2.00
@@ -1072,7 +1081,7 @@ install-all: install-generated-files
        xcopy $(GNUTLS_DIR)\bin\libtasn1-3.dll $(INSTALL_DIR) /d
 !ENDIF
 !IFDEF LUA_DIR
-       xcopy "$(LUA_DIR)\lib\dll\lua5.1.dll" $(INSTALL_DIR) /d
+       xcopy "$(LUA_DIR)\lua5.1.dll" $(INSTALL_DIR) /d
 !ENDIF
 !IFDEF SMI_DIR
        if not exist $(INSTALL_DIR)\snmp mkdir $(INSTALL_DIR)\snmp
git mirror of the wireshark svn