diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-05-30 15:14:40 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-05-31 13:11:05 +0000 |
| commit | 62fd14cbd713765e24212595f8778164dd5b7b44 (patch) | |
| tree | 09838f6a126050e4f7c9a29c70e52e5e2e1aabbe /wsutil/Makefile.nmake | |
| parent | 531541660b31e87922021158454b2441e67935fa (diff) | |
Add nghttp2 lib (HPACK)
Change-Id: I2a361951924045035a2a5d38f943e6b97c170f36
Reviewed-on: https://code.wireshark.org/review/1623
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'wsutil/Makefile.nmake')
| -rw-r--r-- | wsutil/Makefile.nmake | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake index bd45873f1f..873a4348cd 100644 --- a/wsutil/Makefile.nmake +++ b/wsutil/Makefile.nmake @@ -27,13 +27,19 @@ OBJECTS = file_util.obj \ inet_pton.obj \ $(LIBWSUTIL_SRC:.c=.obj) \ strptime.obj \ - wsgetopt.obj + wsgetopt.obj \ + nghttp2/nghttp2_buf.obj \ + nghttp2/nghttp2_hd.obj \ + nghttp2/nghttp2_hd_huffman.obj \ + nghttp2/nghttp2_hd_huffman_data.obj \ + nghttp2/nghttp2_helper.obj # For use when making libwsutil.dll libwsutil.lib: libwsutil.dll libwsutil.exp: libwsutil.dll -libwsutil.dll : $(OBJECTS) ..\image\libwsutil.res +libwsutil.dll : $(OBJECTS) nghttp ..\image\libwsutil.res + @echo Linking libwsutil.dll $(link) $(dlllflags) $(conlibsdll) shell32.lib \ $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ /OUT:libwsutil.dll \ @@ -41,7 +47,7 @@ libwsutil.dll : $(OBJECTS) ..\image\libwsutil.res ..\image\libwsutil.res \ $(OBJECTS) $(libwsutil_LIBS) -clean : +clean-local: rm -f $(OBJECTS) \ libwsutil.lib \ libwsutil.exp \ @@ -49,10 +55,20 @@ clean : libwsutil.dll.manifest \ *.pdb *.sbr +clean: clean-local + cd nghttp2 + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean + cd .. + distclean: clean maintainer-clean: distclean +nghttp: ..\config.h + cd nghttp2 + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake + cd .. + checkapi: ## $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput \ $(PERL) ../tools/checkAPIs.pl -g termoutput -build \ |