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.nmake | |
| 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.nmake')
| -rw-r--r-- | wsutil/Makefile.nmake | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake index 5a08acf234..64dbdb3d46 100644 --- a/wsutil/Makefile.nmake +++ b/wsutil/Makefile.nmake @@ -34,19 +34,14 @@ OBJECTS = file_util.obj \ libwsutil.lib: libwsutil.dll libwsutil.exp: libwsutil.dll -libwsutil.dll : $(OBJECTS) nghttp ..\image\libwsutil.res +libwsutil.dll : $(OBJECTS) ..\image\libwsutil.res @echo Linking libwsutil.dll $(link) $(dlllflags) $(conlibsdll) shell32.lib \ $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ /OUT:libwsutil.dll \ /IMPLIB:libwsutil.lib \ ..\image\libwsutil.res \ - $(OBJECTS) $(libwsutil_LIBS) \ - nghttp2/nghttp2_buf.obj \ - nghttp2/nghttp2_hd.obj \ - nghttp2/nghttp2_hd_huffman.obj \ - nghttp2/nghttp2_hd_huffman_data.obj \ - nghttp2/nghttp2_helper.obj + $(OBJECTS) $(libwsutil_LIBS) # # The following target will rebuild its obj @@ -54,7 +49,7 @@ libwsutil.dll : $(OBJECTS) nghttp ..\image\libwsutil.res # ws_version_info.obj: ..\version.h -clean-local: +clean: rm -f $(OBJECTS) \ libwsutil.lib \ libwsutil.exp \ @@ -62,20 +57,10 @@ clean-local: 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 \ |