aboutsummaryrefslogtreecommitdiffstats
path: root/epan/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
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
2013-02-04More silent build support.Gerald Combs1-5/+0
svn path=/trunk/; revision=47472
2013-02-04Prettify more build output.Gerald Combs1-1/+6
svn path=/trunk/; revision=47469
2013-02-01Add $(AM_V_GEN) in a few more places.Gerald Combs1-2/+2
svn path=/trunk/; revision=47434
2013-02-01Enable more build silence.Gerald Combs1-1/+1
svn path=/trunk/; revision=47432
2013-02-01Go far enough down a rabbit hole and you will encounter libtool. SeeGerald Combs1-1/+1
if changing .o to .lo works. svn path=/trunk/; revision=47430
2013-02-01Change some "<x>.c : <y>.h" rules to "<x>.o : <y>.h" in order to fixGerald Combs1-1/+3
distcheck. Add some rules recommended by the Automake manual in order to avoid duplicate actions. svn path=/trunk/; revision=47429
2013-01-30Fix a couple of dependencies.Gerald Combs1-3/+3
svn path=/trunk/; revision=47369
2013-01-29Use readlink instead of ls.Gerald Combs1-1/+1
svn path=/trunk/; revision=47338
2013-01-28make dumpabi target build with multiple digits in library version numbersBalint Reczey1-1/+1
svn path=/trunk/; revision=47329
2012-10-24Basic skeleton for wmem.Evan Huus1-3/+5
https://www.wireshark.org/lists/wireshark-dev/201210/msg00178.html svn path=/trunk/; revision=45746
2012-09-08Make register_all_wiretap_modules() and register_all_codecs() static;Guy Harris1-1/+1
they're only used internally to epan/plugins.c. svn path=/trunk/; revision=44815
2012-09-07Include wspython if we *do* have libpy, not if we *don't*.Guy Harris1-1/+1
svn path=/trunk/; revision=44809
2012-09-07Revert 44804 as it fails on most OSX and Windows buildbotsAnders Broman1-1/+1
svn path=/trunk/; revision=44804
2012-09-07From pi-rho via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7403 :Jeff Morriss1-1/+1
Correct a logic error which filtered out the Python-related library symbols when Python is enabled. Actually expose some Python-related symbols (which get filtered out if it's not enabled). svn path=/trunk/; revision=44803
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-06-08Forward-port r43165 and r43168 from trunk-1.6.Gerald Combs1-14/+22
------------------------------------------------------------------------ r43165 | gerald | 2012-06-08 14:23:25 -0700 (Fri, 08 Jun 2012) | 4 lines Changed paths: M /trunk-1.6/epan/Makefile.am M /trunk-1.6/wiretap/Makefile.am M /trunk-1.6/wsutil/Makefile.am Use separate commands in the dumpabi recipes instead a big huge long chain. If abi-compliance-checker fails print the contents of its log file. ------------------------------------------------------------------------ r43168 | gerald | 2012-06-08 15:43:50 -0700 (Fri, 08 Jun 2012) | 2 lines Changed paths: M /trunk-1.6/epan/Makefile.am M /trunk-1.6/wiretap/Makefile.am M /trunk-1.6/wsutil/Makefile.am Make sure ln happens in the right directory. ------------------------------------------------------------------------ We don't currently have a usable tag for "git describe --tags --abbrev=0" to latch onto so just use the first 1.9 commit. svn path=/trunk/; revision=43170
2012-06-04There doesn't appear to be a way to convey the message "This library isGerald Combs1-1/+1
under development. Maybe you should use a stable version." via the version number. Use the next best thing and set each number to zero. svn path=/trunk/; revision=43073
2012-04-061.7.1 → 1.7.2.Gerald Combs1-1/+1
svn path=/trunk/; revision=41971