diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2014-07-02 14:10:02 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-07-09 05:31:31 +0000 |
| commit | 4b5967f68391c9ea048c6ca76eef893e764d4779 (patch) | |
| tree | eb816e0ed6784860067300e6ee6313bd88649e8f /epan/Makefile.am | |
| parent | 5f0fd977d134cf7169e4c7131433fa75c4cd5e27 (diff) | |
Moved nghttp2 to epan
Cleaned up nghttp2 build
Change-Id: I9f7adc12936155e0ffc01ec825b5aff95279f97d
Reviewed-on: https://code.wireshark.org/review/2937
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/Makefile.am')
| -rw-r--r-- | epan/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am index f7c75f5b24..de8133f7be 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -33,7 +33,7 @@ wslua_dir = wslua_dist_dir = wslua endif # HAVE_LIBLUA -SUBDIRS = crypt ftypes dfilter dissectors wmem $(wslua_dir) +SUBDIRS = crypt ftypes dfilter dissectors nghttp2 wmem $(wslua_dir) DIST_SUBDIRS = $(SUBDIRS) $(wslua_dist_dir) @@ -126,7 +126,7 @@ libwireshark_la_LIBADD = \ libwireshark_asmopt.la crypt/libairpdcap.la \ ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \ dissectors/libdirtydissectors.la dissectors/libfiledissectors.la \ - wmem/libwmem.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \ + nghttp2/libnghttp2.la wmem/libwmem.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \ @C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \ @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \ ${top_builddir}/wiretap/libwiretap.la @GLIB_LIBS@ \ @@ -136,7 +136,7 @@ libwireshark_la_DEPENDENCIES = \ libwireshark_generated.la \ libwireshark_asmopt.la crypt/libairpdcap.la \ ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \ - dissectors/libdirtydissectors.la wmem/libwmem.la $(wslua_lib) \ + dissectors/libdirtydissectors.la nghttp2/libnghttp2.la wmem/libwmem.la $(wslua_lib) \ ${top_builddir}/wsutil/libwsutil.la \ ${top_builddir}/wiretap/libwiretap.la |