aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2016-07-05extcap: Remove g_spawn_helper supportRoland Knall1-2/+4
Move g_spawn to separate file and implement functions to use Windows based method of spawning, instead of the glib based version Change-Id: Ibae03d834ec86531eba37dc8768fbf17ddadf57f Reviewed-on: https://code.wireshark.org/review/16049 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-06-30Remove Makefile.common filesJoão Valverde1-6/+145
Now that nmake build system has been removed they are not needed anymore. Change-Id: I88075f955bb4349185859c1af4be22e53de5850f Reviewed-on: https://code.wireshark.org/review/16050 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-06-15Remove Nmake build systemPascal Quantin1-4/+0
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-13RADIUS: Add Sangoma dictionaryAlexis La Goutte1-0/+1
From FreeRADIUS master commit ba4b4402588ae87497a0b7c87e26eb5cb433c8a7 Author: Alan T. DeKok <aland@freeradius.org> Date: Fri Jun 10 14:38:55 2016 -0400 Added dictionary.sangoma from http://wiki.sangoma.com/files/NSC-Radius-Support/dictionary.sangoma.txt Change-Id: Ie51ea6343a2a8a5b286d70451abce81ca920261f Reviewed-on: https://code.wireshark.org/review/15823 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-20Add CiscoSystems, vendor id 9 AVPsAndersBroman1-0/+1
Bug 12459 Change-Id: I9ebe7f4a9e6ae03539bd74e535c95c85a8efa55b Reviewed-on: https://code.wireshark.org/review/15506 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-05-16autotools: Check for SpeexDSP system libraryJoão Valverde1-0/+4
Change-Id: Ie07f49ec5a563f3b43a2442e05646c6a0b51ca41 Reviewed-on: https://code.wireshark.org/review/15349 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-05-13Run checkAPIs in epan/wmem/Michael Mann1-0/+1
Was fixed to pass. Let's keep it that way. Change-Id: I49b532b6f1df2430b3912f8f1e9d518caff17d2c Reviewed-on: https://code.wireshark.org/review/15413 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-13automake/nmake: run checkAPIs in ui/cli/Jeff Morriss1-0/+1
cmake already does this. Use checkAPIs arguments appropriate to the cli directory (there's no gtk code here so don't bother checking for deprecated gtk APIs). Change-Id: I3e76ed5260223f05ac1b42431569bde3d1c596ea Reviewed-on: https://code.wireshark.org/review/15403 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-11Run checkAPIs in epan/ .Jeff Morriss1-1/+1
It runs cleanly (no errors anyway) now. Change-Id: I1dca3a3f854c4f2feebcf4193e3c5d444a01e06b Reviewed-on: https://code.wireshark.org/review/15378 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-11Run checkAPIs in epan/ftypes/ .Jeff Morriss1-1/+1
Michael cleaned up the strcpy()'s which were preventing it from running without errors. Change-Id: I3f02150a9b1fbefddb67c0cb90fc2c58766d7d2a Reviewed-on: https://code.wireshark.org/review/15375 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-26Remove the dist tarball after making an RPM.Jeff Morriss1-1/+1
A typo has prevented this from happening for a while. Change-Id: I57f3ed1138d6caffa596f41e6257ecc0eb39a1a6 Reviewed-on: https://code.wireshark.org/review/15112 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-26Avoid making dist tarball if rpmbuild is missingJoão Valverde1-1/+2
Fail sooner rather than later. Change-Id: If5740ee01d79f2eec87038cdbcb0725899735ff6 Reviewed-on: https://code.wireshark.org/review/15113 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25autotools: use AM_CONDITIONAL for rpm build ruleJoão Valverde1-14/+14
Change-Id: Ia97966e28cf7d061694336fb00b9a0790f0d57bb Reviewed-on: https://code.wireshark.org/review/15067 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-04-22There's no version.h.in file.Guy Harris1-1/+0
Change-Id: Ia9c956d5b1f653f111e012fccc892246fcaa8b4b Reviewed-on: https://code.wireshark.org/review/15060 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-28Fix out-of-tree "gen-authors" targetPeter Wu1-3/+2
Change directory to the source tree before invoking `git shortlog`, otherwise it fails on build directories outside the source tree. Alexis suggested to move the git invocation to the perl script, this is done now and also avoids writing AUTHORS.git in the source tree. Change-Id: I5905ebf40d8d32a586c88671b52f28c542ca33ba Reviewed-on: https://code.wireshark.org/review/14660 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-03-25Add ax_lib_socket_nsl.m4 macroJoão Valverde1-20/+0
Add SOCKET_LIBS and NSL_LIBS to global LIBS variables on platforms where it is required. Make configure checks for getaddrinfo/gethostname unconditional, that is handled with #ifdefs if necessary. Change-Id: Ia874038454fb9cf3bdbf8e6fd829f319e331837e Reviewed-on: https://code.wireshark.org/review/14560 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-24Put pcapio.c into a writecap library, and use it.Guy Harris1-0/+6
Change-Id: Ib89f345c072a38bc01f0513366a4bdae3bf6f08e Reviewed-on: https://code.wireshark.org/review/14615 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-24Add files by folder to distribution tarball (EXTRA_DIST)João Valverde1-599/+10
This takes away much of the pain (and merge conflicts) of micro-managing every sub-folder file. Change-Id: I7d7bb1173511ec9312ca4a97c6a59a26b0b194f4 Reviewed-on: https://code.wireshark.org/review/14595 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23Rename 'aclocal-fallback' directory to 'm4'João Valverde1-8/+8
Change-Id: Icac1c43264b6c6fd426d3c5146863a491b48b4ff Reviewed-on: https://code.wireshark.org/review/14569 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23Add pkg.m4 and remove aclocal-flags scriptJoão Valverde1-2/+2
Add pkg-config 0.29.1 macros to our distribution. This makes the aclocal-flags script obsolete, since we are already not using GLib autoconf macros. ACLOCAL_AMFLAGS need only be defined on the top-level Makefile.am. Change-Id: Idd868dcfeb8f279517970d0f96d9d53e3a7e4d5c Reviewed-on: https://code.wireshark.org/review/14568 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23Remove unused autoconf macrosJoão Valverde1-3/+0
Change-Id: Ifb9ab1011373cbe6ac9d6a417f07af76171d87fe Reviewed-on: https://code.wireshark.org/review/14577 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-21Remove ADNS supportJoão Valverde1-11/+2
Relevant mailing list message: https://www.wireshark.org/lists/wireshark-dev/201503/msg00007.html Change-Id: I0cff6d4d64fb52a651bcf6b28c183e43653b1cc2 Reviewed-on: https://code.wireshark.org/review/14519 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-21Fix building without extcap enabledJoão Valverde1-1/+5
Using cmake -DENABLE_EXTCAP=no or ./configure --without-extcap. Some documentation fixes too. Change-Id: Iebf9c843d67e10a32de1a62904de8f88b872ec99 Reviewed-on: https://code.wireshark.org/review/14522 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-18DocBook: Don't require xmllint.Gerald Combs1-1/+0
Remove dependencies on xmllint. We don't write DocBook by hand any more and we haven't used it in a long time in the CMake builds. Change-Id: Ic07f03b00c4554c058eece0462b0925d565b6da1 Reviewed-on: https://code.wireshark.org/review/14506 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-13Move /asn1 to /epan/dissectorsJoão Valverde1-1/+0
Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9 Reviewed-on: https://code.wireshark.org/review/14388 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-10Use AX_PROG_CC_FOR_BUILD macro to identify compiler targeting the build host.Eric Anderson1-0/+1
(When cross-compiling, this is *not* the compiler used to build wireshark itself). Macro ax_prog_cc_for_build.m4 retrieved from http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git Change-Id: I035059d9315e0081dcf1ffbafd9ce6d7ad46700c Reviewed-on: https://code.wireshark.org/review/4503 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Eric Anderson <andersoe@cs.cmu.edu> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08AUTHORS: sort by nameAlexis La Goutte1-1/+1
Change-Id: I01980d1ab757decb7bb84649dbd41477978104c3 Reviewed-on: https://code.wireshark.org/review/14381 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-08Add EditorConfig settings for most C filesJoão Valverde1-0/+1
Change-Id: I02e6d71290bbdf7504437b0d670955b3686b6b52 Reviewed-on: https://code.wireshark.org/review/14360 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08Start adding EditorConfig files.Gerald Combs1-0/+1
Add EditorConfig files where we currently have consistent indentation. This might let us get rid of our editor modeline footers at some point. Change-Id: I156f8d25cfa0050786eb2186c4b2e6d183c3a9ce Reviewed-on: https://code.wireshark.org/review/12383 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-07Update the Automake gen-authors target to match CMake.Gerald Combs1-1/+1
Broken in g32d60ac. Change-Id: Idf9ea0970c30c8eff8e21c3039fe47fd8a175a27 Reviewed-on: https://code.wireshark.org/review/14370 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-07Run checkAPIs in the (epan/) wslua and crypt directories.Jeff Morriss1-3/+2
Don't try to run it (automake only) in dcerpc: there's no target for it there. Change-Id: Idaf1d3d3ac27e837f484520406e604c12c4b473f Reviewed-on: https://code.wireshark.org/review/14346 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-04That patch is gone (we changed the menu category ourselves).Guy Harris1-1/+0
Change-Id: I4a7de0e95347aa7c1085bd4c026aaef02755a98c Reviewed-on: https://code.wireshark.org/review/14350 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-03Create perl script to append existing AUTHORS file with information from git ↵Michael Mann1-0/+5
log. new AUTHORS file can be created with "gen-authors" build parameter The "original" AUTHORS file has been fixed up to be kind to parsers (so no one gets excluded) and renamed to AUTHORS.src. This preserves the features authors worked on. For authors that didn't list features, they may be converted to just getting information from git. Change-Id: I9a4c4091e229f7f5e1c46d864527a98c1278e451 Reviewed-on: https://code.wireshark.org/review/14231 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03Revert "autotools: Use explicit zlib dependency build flags"João Valverde1-16/+8
This reverts commit 2bded0b66137a2f1c8b69911d91903a24f8a2624. Change-Id: Ic898c65df4daaa395eb010e0286d97509346d43a Reviewed-on: https://code.wireshark.org/review/14318 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-03autotools: Use explicit zlib dependency build flagsJoão Valverde1-8/+16
Use pkg-config if a zlib.pc file is available. Remove the now redundant AC_TRY_LINK_FUNC test (there are no linker flags for GTK+ here). Change-Id: I7de744749eba7231ae0097b975144b76ffcf1bdb Reviewed-on: https://code.wireshark.org/review/14263 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-24Check for clang before trying to add -Q flagJoão Valverde1-1/+2
Change-Id: I91a9d8fd4ae6623b3719a3927da1d1b714f08b04 Reviewed-on: https://code.wireshark.org/review/14106 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-02-21autotools: Improve libnl configuration and dependencyJoão Valverde1-2/+4
Change-Id: I3de7c2a6292a2f3fc57fdb849c23c3b31f6e4a13 Reviewed-on: https://code.wireshark.org/review/14052 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-21autotools: Use pkg-config autoconf macros for GLib/GTKJoão Valverde1-68/+68
Remove mostly obsolete aclocal macros. Make GTK build flags a strict superset of GLib flags. Use GTK build variables for GTK GUI and GLib elsewhere. Add dependency flags explicitly instead of using WS_CPPFLAGS. Some minor improvements and fixes for missing/unnecessary variables (no impact on our test builds). Change-Id: I3e1f067a875f79d6516c1fa7af986f17a7a6b671 Reviewed-on: https://code.wireshark.org/review/14005 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-21autotools: Fix multiple repetitions of -L build flagsJoão Valverde1-0/+1
Before: WS_LDFLAGS=' -Wl,--as-needed -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib' After: WS_LDFLAGS=' -Wl,--as-needed -L/usr/local/lib' Bumps autoconf required version to 2.64. Change-Id: Idac0e0382481ddd954b07d9ac729f33c9d11639a Reviewed-on: https://code.wireshark.org/review/14041 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-20autotools: Use Qt flags only for building Qt GUIJoão Valverde1-0/+1
Change-Id: I041e2fab6de948c803cc059e78358077000efee8 Reviewed-on: https://code.wireshark.org/review/14006 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-18Don't add the wiretap directory to the list of include directories.Guy Harris1-3/+2
If you include something from the wiretap directory, always precede it with wiretap/. Fix some includes of files in the top-level directory to use a path relative to the current directory, not relative to the wiretap directory. This makes it a bit clearer what's being included. Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54 Reviewed-on: https://code.wireshark.org/review/13990 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-15Build the extcap programs in the extcap directory.Guy Harris1-47/+14
That lets the version of Wireshark built with autotools find the extcap programs. Don't install the extcap programs under ${datadir} - that puts it under a share directory, and share directories are for platform-independent files, which executable images aren't (they're instruction-set dependent, hence platform-dependent). Change-Id: I992eeb984bdbe6b3476777f7114628c83df6080f Reviewed-on: https://code.wireshark.org/review/13943 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-07autotools: Move SBC dependency to libwscodecsJoão Valverde1-2/+1
Change-Id: I931961033798613b78f846c9176dffdb8385bf43 Reviewed-on: https://code.wireshark.org/review/13782 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-30Update filter bookmark icons.Gerald Combs1-9/+18
Separate the capture and display filter bookmark icons. Make the capture icon green to match(-ish) the active capture icon. Tested on nice+new and janky+old displays. Change-Id: I6ed532c8a49da50fe2a7de3d8fbd0b1af7623b4a Reviewed-on: https://code.wireshark.org/review/13612 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-28autotools: Don't use "user variables" to set build flagsJoão Valverde1-41/+8
GNU coding standards recommend against it and automake is designed around it. This allows overriding the global build flags using AM_CFLAGS, etc., or per object flags, something that is difficult or impossible currently because of automake precedence rules. Change-Id: I3f1ea12e560af5a46b2f04b342b1882bbf123f12 Reviewed-on: https://code.wireshark.org/review/13455 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-21Revert "Diameter: Add Redknee AVPs."Jeff Morriss1-2/+1
As requested by the supplier of the data. This reverts commit ab754d6ba4c0bc6d8d00aec137d8b1e97331d1f4. Change-Id: I3f4e19a0a7f4c75da0e2e2b5a01b187692ebf0a9 Reviewed-on: https://code.wireshark.org/review/13468 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-23Diameter: Add Redknee AVPs.Jeff Morriss1-1/+2
Also add a couple Verizon Wireless and Wimax AVPs. All taken from the attachments to bug 11907. Change-Id: Ie45935f421c4797783f616a75ef35486447ff950 Reviewed-on: https://code.wireshark.org/review/12833 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-22extcap: add randpktdump, a random packet generator.Dario Lombardo1-1/+16
This new extcap is for testing and educational purpose. It relies on rankpkt-core functions to generate random packets. Change-Id: If6890f0673545682995a2079458108edc0913b30 Reviewed-on: https://code.wireshark.org/review/11764 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-16Add files missing from make dists's tarballBalint Reczey1-7/+11
Bug: 11893 Change-Id: I11e6a40856f224e65401b01fafb3e561950ec086 Reviewed-on: https://code.wireshark.org/review/12663 Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-04CMake+PortableApps: Include the VC runtime (second try).Gerald Combs1-0/+1
Move the code that finds the Visual C++ redistributable DLLs to its own module. Run it before we create our NSIS and PortableApps targets. Add a PortableApps target that copies the redistributable This reverts commit 403fa9fbe0cdba3f443ec4674cda40092525ffe4. Bug: 11800 Change-Id: I081d8fd3f5f37dd590659ca8f2bd309642a9a9df Reviewed-on: https://code.wireshark.org/review/12431 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 5b580834aeeee8477039bc099c49c21aeeb3b71f) Reviewed-on: https://code.wireshark.org/review/12432 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>