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 /wsutil/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 'wsutil/Makefile.am')
| -rw-r--r-- | wsutil/Makefile.am | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index c2e0c22186..dea504eafc 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -18,8 +18,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -SUBDIRS = nghttp2 - DIST_SUBDIRS = $(SUBDIRS) ACLOCAL_AMFLAGS = `../aclocal-flags` @@ -82,14 +80,12 @@ EXTRA_libwsutil_la_SOURCES= \ wsgetopt_int.h libwsutil_la_DEPENDENCIES= \ - nghttp2/libnghttp2.la \ $(wsutil_optional_objects) libwsutil_la_LIBADD = \ @COREFOUNDATION_FRAMEWORKS@ \ @GLIB_LIBS@ \ @LIBGCRYPT_LIBS@ \ - nghttp2/libnghttp2.la \ $(wsutil_optional_objects) EXTRA_DIST = \ |