diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-05-31 17:42:00 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-05-31 15:49:05 +0000 |
| commit | 09816dd4c594807093fcdec48977cc20760b7507 (patch) | |
| tree | d94b518f8f7aa5300f37cd0652c9c309f5fc45f3 | |
| parent | 158dd9c10d6cf3ec0933e02f5bed13f07edfce98 (diff) | |
nghttp2: do not copy nghttp2* objects in wsutil folder
Change-Id: I114d3a795a93c7612453fcd08f6e30e520dde900
Reviewed-on: https://code.wireshark.org/review/1902
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
| -rw-r--r-- | wsutil/Makefile.nmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake index 873a4348cd..57230e2598 100644 --- a/wsutil/Makefile.nmake +++ b/wsutil/Makefile.nmake @@ -27,12 +27,7 @@ OBJECTS = file_util.obj \ inet_pton.obj \ $(LIBWSUTIL_SRC:.c=.obj) \ strptime.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 + wsgetopt.obj # For use when making libwsutil.dll libwsutil.lib: libwsutil.dll @@ -45,7 +40,12 @@ libwsutil.dll : $(OBJECTS) nghttp ..\image\libwsutil.res /OUT:libwsutil.dll \ /IMPLIB:libwsutil.lib \ ..\image\libwsutil.res \ - $(OBJECTS) $(libwsutil_LIBS) + $(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 clean-local: rm -f $(OBJECTS) \ |