diff options
| author | Dario Lombardo <lomato@gmail.com> | 2015-01-19 19:54:41 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-02-17 11:08:51 +0000 |
| commit | bd911096bd469b70ffedef409746cff8bce68c8a (patch) | |
| tree | fea66dad0b2882bbe17220357d24533509a572a9 /wsutil/Makefile.common | |
| parent | 1478db03d50d4507b47eb06636502836390c7f94 (diff) | |
| download | wireshark-bd911096bd469b70ffedef409746cff8bce68c8a.tar.gz | |
Added JSON native file support.
libjsmn has also been moved from epan/ to wsutil/ to make it visible from wiretap.
Change-Id: I59abb3419acb1baa83194b38152d3651ed5c123c
Bug: 10878
Reviewed-on: https://code.wireshark.org/review/6716
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'wsutil/Makefile.common')
| -rw-r--r-- | wsutil/Makefile.common | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common index aa050da5de..5385c8a7a9 100644 --- a/wsutil/Makefile.common +++ b/wsutil/Makefile.common @@ -50,6 +50,7 @@ LIBWSUTIL_SRC = \ eax.c \ filesystem.c \ g711.c \ + jsmn.c \ md4.c \ md5.c \ mpeg-audio.c \ @@ -98,6 +99,7 @@ libwsutil_nonrepl_INCLUDES = \ eax.h \ filesystem.h \ g711.h \ + jsmn.h \ md4.h \ md5.h \ mpeg-audio.h \ |