aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
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-08Add the @2x expert indicators.Gerald Combs1-0/+5
We currently load the expert indicator resources using an <img> tag. According to QTBUG-36383 the @2x versions won't load unless you've built with Qt 5.4.0 or later. Change-Id: I003fd5d5f10e779f2e7ca6ba9fbb8e033df85b80 Reviewed-on: https://code.wireshark.org/review/7601 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-08Update the expert indicators.Gerald Combs1-1/+0
Add @2x versions. Remove expert_ok. It appears to be unused. Change-Id: If36f839f622e235334a4237a9c5424c15a9945bc Reviewed-on: https://code.wireshark.org/review/7594 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-07Add GenerateTestSh.cmake to the distribution.Gerald Combs1-0/+1
Change-Id: I4cd6b91db7fa0202d6c1918feec9f34b819f09d1 Reviewed-on: https://code.wireshark.org/review/7571 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-02Qt: Add @2x images to the layout preferences.Gerald Combs1-0/+6
Run compress-pngs on the normal and @2x images. Change-Id: Ic5bc3c42273078f32511d986b299d8606c016f6d Reviewed-on: https://code.wireshark.org/review/7499 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-18RADIUS: Add new dicto from FreeRADIUSAlexis La Goutte1-1/+2
commit 6c51e945a73844029f347c3fdaa0de1ec96473f1 Author: Alan T. DeKok <aland@freeradius.org> Date: Tue Feb 10 13:22:39 2015 -0500 New dictionary Change-Id: I60ba21dbadd3e35c1b0b01d7cea14b683f7f2a0c Reviewed-on: https://code.wireshark.org/review/7237 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-18Uninstall wireshark.appdata.xml.Gerald Combs1-1/+2
Change-Id: Ic955e008b686af448f2091de891f8457623ae7d5 Reviewed-on: https://code.wireshark.org/review/7228 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-18Add an appdata entry for Wireshark.Jeff Morriss1-0/+3
Based on the one from Richard Hughes. A French translation of the description field is included. Links to two screenshots are provided--they are stored in my home directory on wireshark.org (for lack of a better place that I can put them). Bug: 10479 Change-Id: Ida9b9e46c0fb23a7baff50f98afa597b25b8ca54 Reviewed-on: https://code.wireshark.org/review/4178 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-04RADIUS: Sync with FreeRADIUS MasterAlexis La Goutte1-0/+2
commit 852f15c72d41c637865776d5b80097e8ffbbb444 Author: Alan T. DeKok <aland@freeradius.org> Date: Mon Jan 26 13:08:21 2015 -0500 As found on the net commit 53bf263d6ca9010acdc004bada894b1bfe0ed676 Author: Tobias Hachmer <tobias@hachmer.de> Date: Mon Jan 26 13:45:04 2015 +0100 add perle dictionary Change-Id: I15dd8705277f3a0cedd2ea12a7cac9974dadf3c0 Reviewed-on: https://code.wireshark.org/review/6835 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
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-26Add Cmakefiles missing from the distribution.Anders1-0/+3
Change-Id: I77333bb1ca4b0fdfa2db095aab2e4e663c029dd3 Reviewed-on: https://code.wireshark.org/review/6797 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-21Link only the GUIs with SBC (if we have SBC). The other programs don'tJeff Morriss1-1/+2
(yet) use libcodec. Also, there's no need to explicitly call pkg-config to get SBC's CFLAGS and LIBS: PKG_CHECK_MODULES does that for you. Change-Id: Ia7aa84bb81b8223773661ae2dc663731acaf6c6b Reviewed-on: https://code.wireshark.org/review/6700 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>
2015-01-20CMake: Set an output directory for plugins.Gerald Combs1-0/+2
Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all platforms. Add WiresharkPlugin.cmake so that we can start defining common macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 Reviewed-on: https://code.wireshark.org/review/6640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-19Updated company name from Nokia Siemens Networks to Nokia Solutions and ↵Josip Medved1-1/+1
Networks. Change-Id: I93782facc2e3f9ff6358cf617968fac30bac1f7a Reviewed-on: https://code.wireshark.org/review/6647 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-16CMakeList.txt/Makefile.am (root) : fix indent (use tabs)Alexis La Goutte1-110/+110
Makefile.am: avoid double space CMakeList.txt: Add modelines info Change-Id: Ic27d16b2f502362509ab13158e5428208afe3925 Reviewed-on: https://code.wireshark.org/review/6570 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-09CMake: Migrate to hhc.cmake.Gerald Combs1-11/+12
Remove FindHHC.cmake in favor of CMake's FindHTMLHelp. Remove the hhc.cmd wrapper. Change-Id: I548e58d2264c74596e9067d5053b056c35089b3c Reviewed-on: https://code.wireshark.org/review/6449 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06Revert e65f581ffa86f6bfd566a9b66ca2c882f465727f, whichJoerg Mayer1-0/+2
reverts commit 89291ad4f3293893387b385a0800cad42215ddd4 Protect the new macro with "m4_ifdef" instead. Add comments to keep the old and the new flags in sync. Change-Id: I37dea1a5c8d743f5dcf4a4d9ff38ff92200271d0 Reviewed-on: https://code.wireshark.org/review/6343 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-01Remove wireshark_cxx.Guy Harris1-1/+1
It may have been part of the "build Qt Wireshark as C++" hacks, and is now causing build problems. Change-Id: If471bf3dca01f1bc6e9b5b871d0de3159e4c8e1c Reviewed-on: https://code.wireshark.org/review/6200 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01Move ui/qt/main.cpp to wireshark-qt.cpp, and get rid of the dummy.cpp hack.Guy Harris1-23/+1
Change-Id: Ib4684264363593372b3bf078cf17cae1a1cb10d6 Reviewed-on: https://code.wireshark.org/review/6199 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-24Put a C comment in dummy.cpp so the user knows where dummy.cpp came fromStephen Fisher1-1/+1
if it is ever created during the build process. Change-Id: Ib3131f63c965ae243f25f98f6209e049323d8360 Reviewed-on: https://code.wireshark.org/review/6030 Petri-Dish: Stephen Fisher <sfisher@sdf.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23Add .mailmap: fix duplicate/wrong e-mail or name in commit logAlexis La Goutte1-0/+1
It will be reused form generate AUTHORS file Change-Id: I43c388df34551b898f15913c2625b1996ace0cbc Reviewed-on: https://code.wireshark.org/review/5841 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com> Reviewed-by: Michael Tüxen <tuexen@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-20Use AC_SEARCH_LIBS() for math functions.Guy Harris1-16/+14
Use it to check whether we need -lm for various math functions - including floorl(). Let it handle adding -lm, rather than having that in the various _LDADD macros. Change-Id: Ic5d24ec35e060306351f4981c92e26879e597d81 Reviewed-on: https://code.wireshark.org/review/5908 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-18Add new cmake.in files to the distributionMaarten Bezemer1-0/+2
Change-Id: I685b9376342087182cc0dc8d9b8ed8e17a5ff8e7 Reviewed-on: https://code.wireshark.org/review/5833 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-18Add new cmake files to the distributionAndersBroman1-0/+2
Change-Id: Iae5ffac472c6d013cf5dd37310278f203a04f8d3 Reviewed-on: https://code.wireshark.org/review/5831 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-11CMake: Make it easier to generate the release notes & NEWS.Gerald Combs1-1/+0
Add convenience targets for generating the release notes and the NEWS file. Make sure we don't run multiple instances of a2x + AsciiDoc at the same time. Add the docbook directory to the build by default unless we're running Windows. Explain why we don't yet build docs on Windows. Make each docbook makefile target optional. Split the ENABLE_GUIDES option into ENABLE_HTML_GUIDES and ENABLE_PDF_GUIDES. Add a default "all_guides" target if either is on. Remove the Debian patch that hacked around the PDF requirement. Copy ws.css to the docbook build directory. Don't build PDF release notes. I'm not sure we ever used them and I don't want to install Java and FOP just to make a release. Change-Id: Ia2f710000c17f9e0b4b514fd373d9a5902889553 Reviewed-on: https://code.wireshark.org/review/5712 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-09Add media playback icons.Guy Harris1-0/+3
Change-Id: I5a9ba1314b0c93098e7b802618f73c7fca608b04 Reviewed-on: https://code.wireshark.org/review/5692 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-04There's no need to talk about update-alternatives here.Jeff Morriss1-12/+0
Our "make install" process does nothing with 'alternatives'. Our RPMs do use alternatives but they do the necessary update-alternatives stuff already. (If someone wants to set up Linux "make install"s to use alternatives it would make sense to put these notes to the user back in.) Change-Id: Ib7f4655a222ccaee83830a97b213656856cee73e Reviewed-on: https://code.wireshark.org/review/5622 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-12-04Don't do the desktop integration stuff if we're not building Wireshark.Guy Harris1-2/+14
Wireshark is the desktop app; if we're not building it (i.e., we're only building the command-line TShark), we don't need any desktop files. Change-Id: Id8244b417fd53c9d55b4d77fe3ad748c98868ad7 Reviewed-on: https://code.wireshark.org/review/5615 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-04Don't do all the fd.o desktop integration stuff on OS X.Guy Harris1-0/+14
It doesn't need it, so don't install those files, or uninstall them, or suggest running various unnecessary commands after the installation finishes. Change-Id: Ieecab22884723670f47f2fc7cc1ac827f48c1967 Reviewed-on: https://code.wireshark.org/review/5614 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-04Put a bunch of suggestions in post-install/post-uninstall hooks.Guy Harris1-12/+41
This covers a bunch of commands that might have to be run after "make install". ("might" - none are needed on OS X, for example, as it's a different desktop and its dynamic loader doesn't have a cache that you have to manually update whenever you install a new shared library.) Change-Id: I21e1728bdde26a7ab1585fdfb54f63fdc1c25dd6 Reviewed-on: https://code.wireshark.org/review/5606 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-03Try to please the buildboots by plasing th '#' at the begining of theAndersBroman1-11/+11
line. Change-Id: Ie17e83504e7fbccb71190b3fdbfb6ad3507a806e Reviewed-on: https://code.wireshark.org/review/5584 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-03Install the other desktop files with "make install" as well.Guy Harris1-22/+24
(And remove them with "make uninstall".) Change-Id: I76b554bf1a1272813d61c8d2c96cda0a152eebb5 Reviewed-on: https://code.wireshark.org/review/5582 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-03Use $(srcdir) when installing image/wsicon.svg.Guy Harris1-1/+1
We're not necessarily running from the top-level source directory. Change-Id: I0bb815275f85630e5316bf593f4ac098d9475308 Reviewed-on: https://code.wireshark.org/review/5579 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-03Uninstall the icons with "make uninstall".Guy Harris1-1/+10
Just in case not all shells expand {list}, create the apps/icons and apps/mimetypes directories separately; that makes it a bit clearer in any case. Change-Id: I25b3426a17a2ca7e1ce3ce1f7f9e1c650db511a7 Reviewed-on: https://code.wireshark.org/review/5578 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-03Get rid of trailing blank.Guy Harris1-1/+1
Change-Id: Ia0eecbbe1ff1778d5c34338e042c0518895663b4 Reviewed-on: https://code.wireshark.org/review/5577 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-03Always install icons, and install them under $(datadir).Guy Harris1-8/+53
We always install them because of bug 10737. We install them under $(datadir) because that's where we should install our data - if your desktop environment can't find the icons there, either it's broken (file a bug) or misconfigured (fix the configuration or, if you didn't configure it, file a bug). Bug: 10737 Change-Id: I567269d8e45e6543d9e39dbedc49830adf7edb9f Reviewed-on: https://code.wireshark.org/review/5576 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-28RADIUS: Sync with FreeRADIUS MasterAlexis La Goutte1-0/+2
commit 30dac6d3dc87aaaa9c29ecdb33874fa57c2bcbc6 Author: Alan T. DeKok <aland@freeradius.org> Date: Tue Nov 25 16:45:45 2014 -0500 as found on the net commit ee79c59d3a1cae76fcb1940710d9a0f7fbdf8427 Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org> Date: Thu Nov 13 17:39:46 2014 -0500 Add memcached rlm_cache_driver commit 6277960bc830891123b00400af56912e51d4d311 Author: Alan T. DeKok <aland@freeradius.org> Date: Tue Oct 28 17:01:49 2014 -0400 Add FreeRADIUS-Response-Delay-USec Change-Id: I705d0e852d38eaace4f71cfc0a38ecdd41c0b58f Reviewed-on: https://code.wireshark.org/review/5510 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-25Add on to the dummy.cpp hack that forces wireshark to be linked with aStephen Fisher1-0/+6
c++ compiler to automatically create a dummy.cpp file and remove it when make clean is issued. This allows make tags to work again since the file isn't missing. Change-Id: I17191ad2acc281734fa12da4d347fd3116018f67 Reviewed-on: https://code.wireshark.org/review/5494 Petri-Dish: Stephen Fisher <sfisher@sdf.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-11-24Revert "Allow "(g)make tags" to work again"Alexis La Goutte1-1/+1
This reverts commit 6b8fe87ef48abb95dd303871d0835c153cf8c891. Change-Id: Ie4f681186c1555e6ab966e7db687035f7fc5e60f Reviewed-on: https://code.wireshark.org/review/5472 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-24Allow "(g)make tags" to work againStephen Fisher1-1/+1
Change-Id: Idcff82aceedbf42652741564e06ca53984078361 Reviewed-on: https://code.wireshark.org/review/5413 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-11-04Add the flag SVGs to the set of files we distribute.Guy Harris1-0/+7
Change-Id: Ib6e9098a4b411eeb1e5f597f3ec5f55e98632ad3 Reviewed-on: https://code.wireshark.org/review/5117 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-03[Radius] Update dictionaries from freeradius 3.0.4Anish Bhatt1-2/+49
Update includes all new/renamed dictionaries in radius, but does not cover any differences in already included dictionaries, which will be handled in a separate update. Change-Id: I6d1e1cc1815423fb71ec940366964a366ab41a25 Reviewed-on: https://code.wireshark.org/review/4947 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-28Qt: Add a set of 2x 16-pixel toolbar icons.Gerald Combs1-27/+49
Optimize the toolbar PNGs. To do: The rest of the PNGs. Change-Id: Ieed8b0d099655994d43cdc9cf6c9a094d84c1802 Reviewed-on: https://code.wireshark.org/review/4978 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-28Try to fix dist.Gerald Combs1-9/+35
Change-Id: I1802fd4e53132e76534b6dadbaa9713249af42e5 Reviewed-on: https://code.wireshark.org/review/4966 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-23OS X: Integrate CMake and osx-app.shGerald Combs1-1/+3
Add a -cb/--create-bundle option to osx-app.sh which builds the application bundle. Use it in Autotools. (CMake does this by default.) Copy over linker flags from configure.ac to CMakeLists.txt to support rpathification and code signing. Add an osx-app custom target to CMake. Change-Id: I6c20a1c27f8954aaea62904b7425b9312d994803 Reviewed-on: https://code.wireshark.org/review/4918 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-23Try to fix dist.Gerald Combs1-1/+0
Change-Id: I73d269c67a0ad5bb6f67fef8da5fc4ca86f169e3 Reviewed-on: https://code.wireshark.org/review/4263 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-22Fix dist.Gerald Combs1-0/+6
Change-Id: I68963f000dc927398d7d41193674e55050e7c634 Reviewed-on: https://code.wireshark.org/review/4248 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-22Qt: Use wsiconcap while we're capturing.Gerald Combs1-0/+1
Set the main window icon to the "wsiconcap" version while we're capturing similar to the GTK+ version. Verified on Windows. Not sure if this will do anything on other platforms. Change-Id: I9b082601a2c47e5f52cc38ac8d9b4d9f5fb9a4d9 Reviewed-on: https://code.wireshark.org/review/4230 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-21Qt: Multi-state capture start icon.Gerald Combs1-0/+4
Add ".on" versions of the x-capture-start icon along with corresponding code in the StockIcon constructor to look for ".on" variants and add them with the QIcon::On state. Make the plain versions of x-capture-start blue to match the general application icon. The goal is to make the toolbar and app icon fins blue when Wireshark is "at rest" and green when it's capturing. Change-Id: I31f4f9d910fc99c41d7c63bd9a722db1611760c7 Reviewed-on: https://code.wireshark.org/review/4225 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-20Qt: Add stock icons.Gerald Combs1-13/+87
The new icons are patterned after the existing capture icons. They could probably benefit from some adjustments here and there. Start moving toward icon names and a directory layout compliant with freedesktop.org's Icon Naming Specification and Icon Theme Specification. We aren't fully compliant and might never be but anyone with exposure to FDO icon themes should at least know where everything is. Make Capture Start (x-capture-start) the first icon in the toolbar. Define the Colorize Packets, Auto Scroll, and zoom icons even though the Qt UI doesn't use them yet. Leave the Capture Filter, Display Filter, Coloring Rules, Preferences, and Help icons off for now. The GTK+ toolbar is overly cluttered and I'm not sure they're necessary. Try not to break ui/gtk/toolbar_icons.h. Remove welcome.qrc. I initially added it in case we needed to overlay the welcome screen with translucent .pngs but that never happened. To do: - Move the old GTK+ icons to their own directory. - Find a better name for the "toolbar" directory. "stock"? - Make the toolbar configurable. Change-Id: Ie07592113d307b8db786aedace672312a870fe38 Reviewed-on: https://code.wireshark.org/review/4182 Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 17:49:58 +0000