aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
diff options
context:
space:
mode:
authorTomas Kukosa <tomas.kukosa@siemens.com>2009-06-10 21:08:01 +0000
committerTomas Kukosa <tomas.kukosa@siemens.com>2009-06-10 21:08:01 +0000
commit40cc6f91087147d8bbba6794eae088e4e2d49754 (patch)
tree23a079f1a621897aad50242fae63f2a6a628b492 /Makefile.nmake
parentfffb5f50435027c19e395c13438c96ddbeb425ab (diff)
Update to the GnuTLS 2.8.1
svn path=/trunk/; revision=28689
Diffstat (limited to 'Makefile.nmake')
-rw-r--r--Makefile.nmake6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 0d1e12ac6a..ea951c3341 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -814,7 +814,7 @@ process_libs:
!IFDEF GNUTLS_DIR
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- . gnutls-2.6.4-1.zip
+ . gnutls-2.8.1-1.zip
!ENDIF
!IFDEF PORTAUDIO_DIR
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@@ -892,7 +892,7 @@ clean_setup:
rm -r -f $(WIRESHARK_LIBS)/gettext-runtime-0.17-1
rm -r -f $(WIRESHARK_LIBS)/gettext-0.17-1 # win64
rm -r -f $(WIRESHARK_LIBS)/glib
- rm -r -f $(WIRESHARK_LIBS)/gnutls-2.6.3-1
+ rm -r -f $(WIRESHARK_LIBS)/gnutls-2.8.1-1
rm -r -f $(WIRESHARK_LIBS)/gnutls-2.6.4-1
rm -r -f $(WIRESHARK_LIBS)/gtk2
rm -r -f $(WIRESHARK_LIBS)/gtk+
@@ -1088,8 +1088,6 @@ install-all: install-generated-files
!IFDEF GNUTLS_DIR
xcopy $(GNUTLS_DIR)\bin\libgcrypt-11.dll $(INSTALL_DIR) /d
xcopy $(GNUTLS_DIR)\bin\libgnutls-26.dll $(INSTALL_DIR) /d
- xcopy $(GNUTLS_DIR)\bin\libgnutls-extra-26.dll $(INSTALL_DIR) /d
- xcopy $(GNUTLS_DIR)\bin\libgnutls-openssl-26.dll $(INSTALL_DIR) /d
xcopy $(GNUTLS_DIR)\bin\libgpg-error-0.dll $(INSTALL_DIR) /d
xcopy $(GNUTLS_DIR)\bin\libtasn1-3.dll $(INSTALL_DIR) /d
!ENDIF