aboutsummaryrefslogtreecommitdiffstats
path: root/epan/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2015-07-02Lemon: Update lemon toolsAlexis La Goutte1-1/+1
Update from SQLite trunk (19 April 2015) Add include <config.h> Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_) Fix implicit conversion loses integer precision Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare] Fix function declaration isn’t a prototype [-Wstrict-prototypes] Fix warning: old-style function definition [-Wold-style-definition] Fix trailing whitespace Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake Fix -Wmissing-prototypes Remove unused function (acttab_free) Add basename the filename with only filename (no path...) Fix lemon.c:3435: warning: implicit conversion shortens 64-bit value into a 32-bit value Add "new" version of lempar.c (3 November 2009). LEMPAR: fix trailing whitespace LEMPAR: fix -Wunused-parameter Change-Id: I2df7e39c9a6846de26743a981fb76aca423fe813 Reviewed-on: https://code.wireshark.org/review/6502 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-181.99.7 → 1.99.8Gerald Combs1-1/+1
Change-Id: I3423fd2959b1031480f15504ce38336ce3475b17 Reviewed-on: https://code.wireshark.org/review/8979 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-281.99.6 → 1.99.7.Gerald Combs1-1/+1
Change-Id: I8c431f162d199c8507ba57d84e496dce5f5a0933 Reviewed-on: https://code.wireshark.org/review/8677 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-201.99.5 → 1.99.6.Gerald Combs1-1/+1
Change-Id: Iff642606bdb9858dc54b90abe02bf1572f44fc25 Reviewed-on: https://code.wireshark.org/review/7766 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-191.99.4 → 1.99.5.Gerald Combs1-1/+1
Change-Id: Ifa1a57ac2db5d921d9b53dbe997cfa1916720c26 Reviewed-on: https://code.wireshark.org/review/7759 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-13Add a test-programs target everywhere.Gerald Combs1-0/+3
Add a "test-programs" target to each toolchain which builds each unit test executable. "test-programs" must now be built before running the unit test suite. Change-Id: I9317a1e305d987f244c4bd8b4a7f05d11fed7090 Reviewed-on: https://code.wireshark.org/review/7673 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-051.99.3 → 1.99.4.Gerald Combs1-1/+1
Change-Id: I96953b6ca34140972a783c3066614399981ca1e2 Reviewed-on: https://code.wireshark.org/review/7549 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-17Added JSON native file support.Dario Lombardo1-3/+3
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>
2015-02-041.99.2 → 1.99.3.Gerald Combs1-1/+1
Change-Id: Id03d0243f20b33873a92be7444b61952d0b18638 Reviewed-on: https://code.wireshark.org/review/6956 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-04Simplify how we find Lua and expand the places we look.Jeff Morriss1-1/+1
First, it appears some packagers actually ship a pkg-config file for Lua. Try to use it. (Unfortunately the package name varies so we have to try several package names.) If that fails, try to find Lua directly, accounting for the various naming conventions we've seen. Bug: 10475 Bug: 10572 Change-Id: I82e789c466a488dc12431cdd90c49b4c1052414a Reviewed-on: https://code.wireshark.org/review/6756 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-28Add files missing from the tarball.Anders1-1/+2
Change-Id: I126f40ac122a7b9236e8718a89d35ad12fc89c04 Reviewed-on: https://code.wireshark.org/review/6834 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-19JSON dissector changed into heuristic dissector.Dario Lombardo1-3/+5
To check if a payload is json, the library libjsmn has been added to the source tree, with its licence (MIT). TODO: the libjsmn can be used to extract tokens in the standard dissection other than heurisitic part. HPFEEDS dissector has also been changed in order to leverage the new json dissector. Bug: 10834 Change-Id: Ib1df2a699982dbdd2b5418e97edbdb5cbd9c8978 Reviewed-on: https://code.wireshark.org/review/6350 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-11Revert "Lemon: Update lemon tools"Pascal Quantin1-1/+1
This reverts commit 5855dd8d538eb81d4825961b1bf0d583bf96f751. This Lemon update fails to compile on OSX and triggers asserts on other platforms Change-Id: I12a8a2bf32db31e5a9b0cb1a67a39724e30f3e91 Reviewed-on: https://code.wireshark.org/review/6496 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-11Lemon: Update lemon toolsAlexis La Goutte1-1/+1
Fix warning: declaration shadows a variable in the global scope [-Wshadow] Add include <config.h> Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_) Fix implicit conversion loses integer precision Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare] Fix function declaration isn’t a prototype [-Wstrict-prototypes] Fix warning: old-style function definition [-Wold-style-definition] Fix trailing whitespace Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake Fix -Wmissing-prototypes Remove unused function (acttab_free) Add basename the filename with only filename (no path...) Change-Id: Ia79f61e29f828575df61cc89134c6c553044e86d Reviewed-on: https://code.wireshark.org/review/3976 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-30Create the compress module for compression functions.Matthieu Patou1-2/+4
For the moment there is only the lzxpress compression used by DRS Bug: 10546 Change-Id: Ifc7e1767934224c0198f0b09caa3efbad979ca1f Reviewed-on: https://code.wireshark.org/review/4600 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-09Moved nghttp2 to epanGraham Bloice1-3/+3
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>
2014-06-16kill unmaintained python bindingsEvan Huus1-16/+4
Change-Id: I1fa4f0d76b6b29d2935723b83b5ea7165039c807 Reviewed-on: https://code.wireshark.org/review/2258 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-231.11.4 → 1.99.0.Gerald Combs1-1/+1
Change-Id: I5b0f713fdbc63e78f4f52177317c0e536aca3044 Reviewed-on: https://code.wireshark.org/review/1761 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-09Be less aggressive about rebuilding sminmpec.c.Gerald Combs1-4/+3
Instead of forcing developers to generate sminmpec.c (which will have different results depending on the presence or absence of a working Internet connection) add sminmpec.c back to the repository. I'll add it to the weekly update-numbers script so that it will be updated at the same time as manuf, services, enterprise-numbers, and usb.c. Change the Autotools, CMake, and Nmake sminmpec.c target name to "update-sminmpec". Remove the mtime check from make-sminmpec.pl. Update enterprise-numbers and sminmpec.c while we're here. Tested with an in-tree Autotools build and an out-of-tree CMake build. Change-Id: Iecc332ce2731e3e98ab0205a56c78807e599a026 Reviewed-on: https://code.wireshark.org/review/1516 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-25Support out-of-source checkapiStig Bjørlykke1-1/+3
Always call $(top_srcdir)/tools/checkAPIs.pl with -sourcedir=$(srcdir) from Makefile.am to allow out-of-source 'make checkapi'. Change-Id: I60d7e0079984a8ededdacf4517a0738486fa7973 Reviewed-on: https://code.wireshark.org/review/1294 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-151.11.3 → 1.11.4.Gerald Combs1-1/+1
Change-Id: I0bf8792b9b524ae4d8e1022b234e2510972c7019 Reviewed-on: https://code.wireshark.org/review/1154 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-16Remove Visual Studio solution and project files (and their existence from ↵Michael Mann1-1/+0
Makefiles) There have been discussions on -dev about removing this and I believe I was the last holdout. Finally convinced that I should just have a local copy (ignored by git) Change-Id: Ic72a22baf58e3412023cf851f0fce16eb07113b0 Reviewed-on: https://code.wireshark.org/review/681 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-12Fix indent (Remove space and use tabs)Alexis La Goutte1-14/+14
Change-Id: I9cc33a43e0f06dfad3f9fb53ad0df636f2ea7020 Reviewed-on: https://code.wireshark.org/review/615 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-11Fix incorrect file in epan/Makefile.am when build with ENABLE_STATICAlexis La Goutte1-6/+0
Change-Id: I7f76e3e3d2d6f3edd2a658fccd5953393ef74ed7 Closed-bug: 9871 Reviewed-on: https://code.wireshark.org/review/596 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-11-181.11.2 → 1.11.3.Gerald Combs1-1/+1
svn path=/trunk/; revision=53412
2013-11-17Move the epan/filesystem.c routines to wsutil; they're not specific toGuy Harris1-2/+1
packet dissection, they're specific to the entire Wireshark suite of programs. svn path=/trunk/; revision=53377
2013-11-151.11.1 → 1.11.2.Gerald Combs1-1/+1
svn path=/trunk/; revision=53346
2013-10-29Make it so out-of-tree builds (autofoo and cmake) have access to the variousJeff Morriss1-1/+2
data files (diameter/*, COPYING, manuf) when running *shark from the build directory. Do this by passing in the top-level source directory as a compile-time definition (unfortunately this has to be in the top-level Makefile too because some programs link directly with epan/filesystem.c). The plugins dir is no longer below the datafile directory but rather the progfile directory (if we have one). Handle the special case of AUTHORS-SHORT (a data file but a generated one) by checking the file name before building the path. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5664 svn path=/trunk/; revision=52940
2013-10-19Don't link explicitly with libwmem, it's already in libwireshark and the symbolEvan Huus1-1/+0
doubling leads to all sorts of very subtle badness (including test failures due to funny internal assertions because the two wmems have mismatching state). Make wmem_init and wmem_cleanup PUBLIC instead of LOCAL so that they don't get stripped and don't cause a link failure when trying to build oids_test (now that it's not linking with libwmem explicitly). There is possibly a better way to fix this, but I'm not sure what it is. svn path=/trunk/; revision=52694
2013-10-19Add OID unit tests. Bug 9294 ↵Michael Mann1-2/+9
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9294) From Ed Beroset svn path=/trunk/; revision=52692
2013-07-14Export tvb_free_chain() so that tvbtest can use it.Guy Harris1-3/+5
As on Windows with MSVC, and as with reassemble_test, link tvbtest with libwireshark and the libraries it requires. svn path=/trunk/; revision=50575
2013-07-14Fix tvbtest linking, move private structures to tvbuff_subsetJakub Zawadzki1-1/+1
svn path=/trunk/; revision=50570
2013-07-12Move the print modules into epan.Jeff Morriss1-0/+2
svn path=/trunk/; revision=50526
2013-06-21create libfiledissectors.a during the autotools buildMartin Kaiser1-1/+2
svn path=/trunk/; revision=50097
2013-06-05Change leading spaces to tabs so all plugin_src's are now the same.Chris Maynard1-42/+42
svn path=/trunk/; revision=49796
2013-04-30Move the contents of wsar_html/core to wsar_html. Create tag files forGerald Combs1-0/+1
core, epan, and ui, and link them to each other to varying degrees. This seems to be the best way to organize our documentation. The alternative is to switch to a single doxygen.cfg and manually add files to different groups or sections. Add a wireshark.dox file which contains markup for the main page. Add .dox and .txt to svnadd. Clean up our tag files. Force wsar_html to rebuild each time. svn path=/trunk/; revision=49091
2013-04-26Buildbot (via Twisted) sets a restrictive umask. Unset it before we runGerald Combs1-1/+1
Doxygen. svn path=/trunk/; revision=49052
2013-04-26Add some Doxygen checks.Gerald Combs1-0/+2
svn path=/trunk/; revision=49051
2013-04-26Update the main, epan, and ui Doxygen configuration files. Change theGerald Combs1-0/+3
output directory to wsar_html (Wireshark API Reference HTML) to match the Docbook naming convention. In each doxygen.cfg.in move the doxygen_global.cfg to the top of the file so that our local definitions don't get clobbered. Add makefile targets for wsar_html and wsar-zip. svn path=/trunk/; revision=49043
2013-04-221.9.3 → 1.11.0.Gerald Combs1-1/+1
svn path=/trunk/; revision=48972
2013-04-07Requiescat in pace epan/dissectors/packet-rtps2.h.Guy Harris1-1/+0
svn path=/trunk/; revision=48761
2013-03-281.9.2 → 1.9.3.Gerald Combs1-1/+1
svn path=/trunk/; revision=48627
2013-03-181.9.1 → 1.9.2.Gerald Combs1-1/+1
svn path=/trunk/; revision=48406
2013-03-12From David Arnold:Jaap Keuter1-1/+1
Replace use of INCLUDES with AM_CPPFLAGS in all Makefiles to placate recent autotools. svn path=/trunk/; revision=48261
2013-03-01Export libwireshark symbols using WS_DLL_PUBLIC defineBalint Reczey1-21/+4
Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992
2013-02-25Add dumpabi targets to CMake buildsBalint Reczey1-1/+1
Also update automake generated targets to match CMake generated ones svn path=/trunk/; revision=47879
2013-02-12Fix the grammar.h/grammar.c/grammar.lemon dependency so thatGilbert Ramirez1-3/+2
grammar.h is not always out of date. Use the same pattern as in the Makefile.nmake files svn path=/trunk/; revision=47643
2013-02-09Put NODIST_ at the beginning of macro names, as was done for the pluginsGuy Harris1-4/+4
directory. svn path=/trunk/; revision=47599
2013-02-05Don't distribute the results of running Lemon, as we distribute LemonGuy Harris1-6/+10
ourselves. Clean up various bits of "distribute" vs. "don't distribute" stuff in the process - use similar names, and make the "distribute vs. don't distribute" distinction the same as the "don't clean with "make distclean" vs. clean with "make distclean"" distinction. svn path=/trunk/; revision=47485
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 12:11:06 +0000