diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-11-24 11:45:51 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-11-24 11:45:51 +0000 |
| commit | 24f27a48ecac7eb23f82878aaadb9517d9b4c36b (patch) | |
| tree | e90de2d454ffe593dbefef0a34d643ab38ea95a7 /Makefile.nmake | |
| parent | 62150ef57e48246f2b6072746bdb9c3410b06ff3 (diff) | |
Support for the automatic configuration of the UPX dll/exe packer.
config.nmake - default UPX to the downloaded version in $WIRESHARK_LIBS
win32-setup.sh - updated to also add executables bit to exes - and also use new tag
Makefile.nmake - to download UPX (and also use new version of user-guide)
svn path=/trunk/; revision=23562
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index fcebb5bb71..6983f5997d 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -768,7 +768,11 @@ process_libs: !ENDIF !IFDEF HHC_DIR @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - user-guide user-guide-20494.zip + user-guide user-guide-23522.zip +!ENDIF +!IFDEF UPX + @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ + . upx301w.zip !ENDIF @echo. @echo Wireshark is ready to build. @@ -797,6 +801,7 @@ clean_setup: rm -r -f $(WIRESHARK_LIBS)/AirPcap_Devpack_1_0_0_594 rm -r -f $(WIRESHARK_LIBS)/zlib123 rm -r -f $(WIRESHARK_LIBS)/zlib123-dll + rm -r -f $(WIRESHARK_LIBS)/upx301w ################################################################################ # Prepare the debug trees for running Wireshark/Tshark from there. |