diff options
| author | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-01-08 13:24:04 +0000 |
|---|---|---|
| committer | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-01-08 13:24:04 +0000 |
| commit | 0b03220c57fed8fe6e85cb279171d391bf4ca684 (patch) | |
| tree | dc58ede0bd55b953274ef103262fa2aa6179efb8 /Makefile.nmake | |
| parent | f6b0b0c44fefc1c8a612daac037c2edd0f8ee2fa (diff) | |
display runtime versions of GnuTLS and Gcrypt libraries
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27194 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 026faa3553..b776df2b9b 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -60,6 +60,7 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib shell32.lib comctl32.lib \ $(HHC_LIBS) \ wsutil\libwsutil.lib \ + $(GNUTLS_LIBS) \ !IFDEF ENABLE_LIBWIRESHARK epan\libwireshark.lib \ !ELSE @@ -71,14 +72,14 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ $(C_ARES_LIBS) \ $(ADNS_LIBS) \ $(PCRE_LIBS) \ - $(ZLIB_LIBS) \ - $(GNUTLS_LIBS) + $(ZLIB_LIBS) !ENDIF tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ $(GLIB_LIBS) \ wsutil\libwsutil.lib \ + $(GNUTLS_LIBS) \ !IFDEF ENABLE_LIBWIRESHARK epan\libwireshark.lib \ !ELSE @@ -90,14 +91,14 @@ tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ $(C_ARES_LIBS) \ $(ADNS_LIBS) \ $(PCRE_LIBS) \ - $(ZLIB_LIBS) \ - $(GNUTLS_LIBS) + $(ZLIB_LIBS) !ENDIF rawshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ $(GLIB_LIBS) \ wsutil\libwsutil.lib \ + $(GNUTLS_LIBS) \ !IFDEF ENABLE_LIBWIRESHARK epan\libwireshark.lib \ !ELSE @@ -109,8 +110,7 @@ rawshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ $(C_ARES_LIBS) \ $(ADNS_LIBS) \ $(PCRE_LIBS) \ - $(ZLIB_LIBS) \ - $(GNUTLS_LIBS) + $(ZLIB_LIBS) !ENDIF capinfos_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ @@ -136,12 +136,14 @@ text2pcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ dumpcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ wsutil\libwsutil.lib \ - $(GLIB_LIBS) + $(GLIB_LIBS) \ + $(GNUTLS_LIBS) dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ $(GLIB_LIBS) \ wsutil\libwsutil.lib \ + $(GNUTLS_LIBS) \ !IFDEF ENABLE_LIBWIRESHARK epan\libwireshark.lib \ !ELSE @@ -152,8 +154,7 @@ dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ $(ADNS_LIBS) \ $(PCRE_LIBS) \ $(ZLIB_LIBS) \ - $(SMI_LIBS) \ - $(GNUTLS_LIBS) + $(SMI_LIBS) !ENDIF randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ |