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 /epan/Makefile.nmake | |
| parent | 1478db03d50d4507b47eb06636502836390c7f94 (diff) | |
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 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 47d5bcca4b..f0ad957250 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -71,7 +71,6 @@ libwireshark_LIBS = \ dfilter\dfilter.lib \ wmem\wmem.lib \ $(WSLUA_LIB) \ - jsmn\jsmn.lib \ nghttp2\nghttp2.lib \ dissectors\dissectors.lib @@ -92,17 +91,17 @@ DOXYGEN_DEP=doxygen !ENDIF !IFDEF ENABLE_LIBWIRESHARK -all: compress crypt ftypes dfilter wmem $(WSLUA_DIR) jsmn nghttp2 dissectors libwireshark.dll +all: compress crypt ftypes dfilter wmem $(WSLUA_DIR) nghttp2 dissectors libwireshark.dll !ELSE -all: compress crypt ftypes dfilter wmem $(WSLUA_DIR) jsmn nghttp2 dissectors libwireshark.lib +all: compress crypt ftypes dfilter wmem $(WSLUA_DIR) nghttp2 dissectors libwireshark.lib !ENDIF # For use when making libwireshark.dll libwireshark.lib: libwireshark.dll libwireshark.exp: libwireshark.dll -libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) compress crypt ftypes dfilter wmem $(WSLUA_DIR) jsmn nghttp2 dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ - crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib wmem\wmem.lib dissectors\dissectors.lib $(WSLUA_LIB) jsmn\jsmn.lib nghttp2\nghttp2.lib ..\image\libwireshark.res +libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) compress crypt ftypes dfilter wmem $(WSLUA_DIR) nghttp2 dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ + crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib wmem\wmem.lib dissectors\dissectors.lib $(WSLUA_LIB) nghttp2\nghttp2.lib ..\image\libwireshark.res @echo Linking libwireshark.dll $(link) $(dlllflags) $(conlibsdll) shell32.lib psapi.lib \ $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ @@ -112,8 +111,8 @@ libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) compress crypt ftypes dfil dissectors\register.obj \ $(EXTRA_OBJECTS) -libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) compress crypt ftypes dfilter wmem $(WSLUA_DIR) jsmn nghttp2 dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ - crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib wmem\wmem.lib $(WSLUA_LIB) jsmn\jsmn.lib nghttp2\nghttp2.lib dissectors\dissectors.lib +libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) compress crypt ftypes dfilter wmem $(WSLUA_DIR) nghttp2 dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ + crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib wmem\wmem.lib $(WSLUA_LIB) nghttp2\nghttp2.lib dissectors\dissectors.lib link /lib /out:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \ $(EXTRA_OBJECTS) @@ -144,8 +143,6 @@ clean: clean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../wslua $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../jsmn - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../nghttp2 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd .. @@ -182,8 +179,6 @@ distclean: distclean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../wslua $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../jsmn - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../nghttp2 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd .. @@ -205,8 +200,6 @@ maintainer-clean: maintainer-clean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../wslua $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../jsmn - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../nghttp2 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd .. @@ -246,11 +239,6 @@ wslua:: ..\config.h $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. -jsmn:: ..\config.h - cd jsmn - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - nghttp2:: ..\config.h cd nghttp2 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake |