aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
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>
2014-09-16Fix the patch-bzip2 target.Gerald Combs1-2/+2
The main site URI scheme is now https. Update the URL in some other places while we're here. Change-Id: Ib03d4fd1c58dabd3cf5050dc4f79216e0b94d525 Reviewed-on: https://code.wireshark.org/review/4133 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-06Put asn1 back as a distributed subdirectory.Guy Harris1-0/+1
If it's not there, "make distcheck" fails. In addition, 1) "make distclean" doesn't clean out the Makefile.in files under asn1 and 2) you don't get to see the source from which the ASN.1 dissectors were built if you have a source tarball. Change-Id: Ied59d42950373476a535fcf9cfccece46de92599 Reviewed-on: https://code.wireshark.org/review/4013 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-06Remove obsolete dissectors.AndersBroman1-1/+0
Change-Id: Icd480491670de9d8495a95861b18a8a5cb9724b4 Reviewed-on: https://code.wireshark.org/review/4006 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-02Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs1-28/+27
Make sure the Qt UI is named "Wireshark" and its executable is named "wireshark" or "wireshark.exe". Make sure the GTK+ UI is named "Wireshark 1" or "Wireshark (GTK+)" depending on how much the target audience is likely to care about UI toolkits. Make sure the GTK+ executable is named "wireshark-gtk" or "wireshark-gtk.exe". It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps package. It's likely even more broken now. Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake 1.11.3) at some point. The first attempt to compile in ui/qt returns "error: source_file.cpp: No such file or directory". The second attempt works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1). Tested: - Nmake builds - NSIS packaging - CMake builds (Windows, OS X) - Autotools build and distcheck - RPM packaging To do: - Test Debian packaging - Fix PortableApps Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2 Reviewed-on: https://code.wireshark.org/review/3919 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-29Consolidate several 3GPP Diameter xml files into one.Jeff Morriss1-6/+1
Change-Id: If6ef48fbcceaf0b3a3591086015b021c6a80956b Reviewed-on: https://code.wireshark.org/review/3911 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-28Add 3GPP2 Tx AVPs. Move all the 3GPP2 stuff into its own XML file.Jeff Morriss1-0/+1
Change-Id: I7197f84472139c99bafa5b68f724abaab0453faa Reviewed-on: https://code.wireshark.org/review/3908 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-06Revert "Add a cmake build to distcheck to ensure that we distribute all the ↵Jeff Morriss1-11/+0
files necessary to do a cmake build." We can't know, in autofoo, what arguments are necessary to make 'cmake' actually run successfully on a given system. We should probably just add a buildbot step to build cmake from the source tarball. This reverts commit 70a6d204a7f0b4039ee986cd6557cd7242e5ff0c. Change-Id: I1961b79ece2e26bafad3eddb189bd0cfab2af846 Reviewed-on: https://code.wireshark.org/review/3460 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-06Revert "When doing the distcheck cmake check only verify that cmake runs, ↵Jeff Morriss1-0/+1
don't verify that it can build Wireshark." This change doesn't help: we can't get cmake to run properly. This reverts commit 956f4423df447f2e7c0f9691ba9928f104d79820. Change-Id: If1c0ec13ff35fdaa266dcd491350477e2bd91bd1 Reviewed-on: https://code.wireshark.org/review/3459 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-05When doing the distcheck cmake check only verify that cmake runs, don't verifyJeff Morriss1-1/+0
that it can build Wireshark. The purpose of the cmake check is to ensure we are distributing all the of necessary cmake files. We don't want to get into the business of giving cmake all the options required to actually build Wireshark (e.g., which version of Qt is installed and where). This also means that distcheck doesn't compile Wireshark twice. Change-Id: I62f5c42df7c710f7695bd020b0dda80e54435829 Reviewed-on: https://code.wireshark.org/review/3432 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-04Add a cmake build to distcheck to ensure that we distribute all the filesJeff Morriss1-0/+11
necessary to do a cmake build. Note that this does mean that anyone doing "make distcheck" needs cmake. Bug: 10331 Change-Id: I4360a305aa7f6ffc1b5a5dffad24b928eed45016 Reviewed-on: https://code.wireshark.org/review/3326 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-04Rip out the filetap codeEvan Huus1-8/+0
We decided at sharkfest that this wasn't the right design for file dissection; we have more-or-less settled on way forward, but nobody's shown interest in implementing it. Whether or not that ever happens, this code is effectively dead and should be removed. Change-Id: I14d6086df3204fffb6485228db39d9f407661417 Reviewed-on: https://code.wireshark.org/review/3400 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-01Add doxygen_global.cfg to the source distribution.Jeff Morriss1-1/+2
Change-Id: Ifc552ac74b84bce2a695189794440c905bf140a5 Reviewed-on: https://code.wireshark.org/review/3323 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-01Add wireshark.pc.in to the source distribution (needed for cmake).Jeff Morriss1-0/+1
Bug: 10331 Change-Id: I81e0d224917cd4b38215e28ec146cd80efdb99d2 Reviewed-on: https://code.wireshark.org/review/3316 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-07-31Add more files to the release tarball.Guy Harris1-0/+3
Change-Id: I02ce275154979ff56f8f8929e5909f3035f62c47 Reviewed-on: https://code.wireshark.org/review/3286 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31Add a bunch of missing files to the distribution.Guy Harris1-0/+58
Files from the debian directory, documents from the doc directory, graphics from the docbook/wsug_graphics directory, and the echld Makefile.nmake. Change-Id: Iccccc58811753581b0b180053defd937aea22f95 Reviewed-on: https://code.wireshark.org/review/3283 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31Add some missing CMake files to the distribution.Guy Harris1-0/+17
Change-Id: I67ca59bb77766f4625e64b9042cdcb5d03cd7994 Reviewed-on: https://code.wireshark.org/review/3281 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-27Add some scripts to fix up Qt's OS X binary packages.Guy Harris1-0/+2
You have to run macosx-support-lib-patches/qt-fix-pc-files manually, telling it where Qt was installed, but so it goes.... Change-Id: I8668a1fc4254cc002aee068749edb3cf3bdb854f Reviewed-on: https://code.wireshark.org/review/3215 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-18Fix install_desktop_files non-portability and add out-of-tree support.Fabian Raetz1-5/+10
Prepend $(srcdir)/ to the sources in install commands, and get rid of the -T flag, as it's GNU coreutils install-specific; some versions of install don't support -T at all, and FreeBSD's install has a -T flag that takes an argument and has a completely different meaning. Fixes bug 10292; fix came from http://marc.info/?l=openbsd-ports&m=140571104528980&w=2 Change-Id: I8e80d475a728a17848736be043f97d2b90a0be82 Reviewed-on: https://code.wireshark.org/review/3107 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-15No more README.irix.Guy Harris1-1/+0
Change-Id: I3c906451549d28040f1068356bf7e62bff9cd92a Reviewed-on: https://code.wireshark.org/review/3065 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-04Move utility routines for capturing into a libcaputils static library.Guy Harris1-9/+8
Some of those routines are used only in dumpcap; others are used in TShark and Wireshark as well. Change-Id: I9d92483f2fcff57a7d8b6bf6bdf2870505d19fb7 Reviewed-on: https://code.wireshark.org/review/2841 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-02Fail if any of the install-exec-hook commands fails.Guy Harris1-5/+5
Hopefully, this will mean that somebody doing a set-UID/set-GID/setcap installation as themselves rather than as root will not "succeed" but leave dumpcap installed without enhanced privileges, so the underlying problem in bugs such as bug 10247 will be more obvious. Change-Id: I34393bc2c9ea4dc59854a08524edb4f65e79730b Reviewed-on: https://code.wireshark.org/review/2781 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-26New HP DTD dictionary fileBasil1-0/+1
Bug: 10206 Change-Id: Ibe056ed37d3619aabfb17d3c2c5e85e67deae4e5 Reviewed-on: https://code.wireshark.org/review/2617 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-24Fix OS X CMake build.Guy Harris1-0/+1
I have ***NO*** idea why this makes a difference, but, without this change, APPLE_CORE_FOUNDATION_LIBRARY is apparently *not* set correctly for wsutil/CMakeLists.txt, and, with this change, it is. I guess there's something magic involved here with "global" CMake variables or something crazy such as that. Change-Id: I7a0046b9c249568cd666720838104f48e854e203 Reviewed-on: https://code.wireshark.org/review/2612 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23Move the routines to talk to dumpcap into a static libcapchild.Guy Harris1-7/+40
This pulls some stuff out of the top-level directory, and means we don't have to build them once for every program using them. Change-Id: I37b31fed20f2d5c3563ecd2bae9fd86af70afff5 Reviewed-on: https://code.wireshark.org/review/2591 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-17Simplify obtaining the absolute path of the build dirJoerg Mayer1-2/+2
Change-Id: If0fabce21d7d12435f4f78768f7193564eeb2bb8 Reviewed-on: https://code.wireshark.org/review/2339 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16Get rid of the last bits of Python, as they break the build.Guy Harris1-6/+1
Bereft of life, it rests in peace. Change-Id: I8b9bc8c6cef0635d5526aa6b389aa33bc41fbc66 Reviewed-on: https://code.wireshark.org/review/2284 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-16Remove the (old, broken) Python bindings option to ./configure (and a few ↵Jeff Morriss1-16/+9
other references). Change-Id: I470502bfae6617a798d0c2538f0f04ff7d36fee5 Reviewed-on: https://code.wireshark.org/review/2277 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-12Make sure image/expert_ok.png ends up in a source tarball.Guy Harris1-0/+1
Change-Id: I7ad2b53d706d953d443ef935f1edb84c46d7fa16 Reviewed-on: https://code.wireshark.org/review/2156 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-10Change HAVE_SSE42 to HAVE_SSE4_2 add $(SIMD_FLAGS)AndersBroman1-0/+4
Add autotools macros to distribution Call AX_EXT to define HAVE_SSE4_2 Change-Id: I9ff085d923dfafb32510cdd14290e74a2aaea302 Reviewed-on: https://code.wireshark.org/review/2110 Tested-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09Use only dpkg-buildpackage for building .debsBalint Reczey1-9/+0
This makes .deb generation not depending on autotools and also removes debian-package target from autotools-generated Makefile. Change-Id: Ia684cd310d85906763af1035fddf39c1fbaed984 Reviewed-on: https://code.wireshark.org/review/2052 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-09Fix make debian-packageBalint Reczey1-0/+1
Change-Id: I3474889d18036c239b22c7a21d8e949072250fbb Reviewed-on: https://code.wireshark.org/review/2042 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-08Fix make distBalint Reczey1-13/+0
Change-Id: I96e25a3be6db53fcfacb631fdc48c03a63f195f2 Reviewed-on: https://code.wireshark.org/review/2040 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-05-28Try to fix Ubuntu buildbot (make dist failed)Alexis La Goutte1-1/+0
No rule to make target `cmake/modules/FeatureSummary.cmake', needed by `distdir'. Stop. Change-Id: I66124151ded4d9e3aeed3f9f27aa2fca81a962cb Reviewed-on: https://code.wireshark.org/review/1817 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-25Support out-of-source checkapiStig Bjørlykke1-1/+2
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-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-24Don't include voip_bg.xpm, it's not used any more.AndersBroman1-1/+0
Change-Id: I34fb5166afb7b1218cb7e011096c4a3455b364d3 Reviewed-on: https://code.wireshark.org/review/812 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-16Remove Visual Studio solution and project files (and their existence from ↵Michael Mann1-6/+1
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-13Add tfshark.rc.in to Makefile.amPascal Quantin1-0/+1
Change-Id: I7d987534243a3e1575191f67d8b660c3c4c4731f Reviewed-on: https://code.wireshark.org/review/641 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-12Consistently put -lm at the end of library lists.Guy Harris1-16/+23
I'm not sure why it's associated with GLIB_LIBS in most entries - at some point, was it the case that we didn't use libmath routines but GLib did? - but there's no guarantee that other libraries don't use them, so put them at the end of the lists. That also makes the lists a bit more consistent. (Yes, I know, the wireshark_ldadd list is followed by some other libraries in the library lists that use it, so -lm isn't *really* at the end everywhere.) Change-Id: Ia2e0b295fdaae771fdee7d5eecdefaa83fae9992 Reviewed-on: https://code.wireshark.org/review/622 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-02Added Cisco Starent Diameter dictionary entries.Josip Medved1-0/+1
Change-Id: Ib7fa98639b6de965148349948ccf86d8c8641fb1 Reviewed-on: https://code.wireshark.org/review/438 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-07Replace "svn" with "git" all over the place.Gerald Combs1-3/+3
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-02Install SVG icon.Ville Skyttä1-0/+2
Closes-Bug: #9590 Change-Id: I20b29ccc4237434c4a3d11615fc2cad832c3c685 Reviewed-on: https://code.wireshark.org/review/80 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-12One more place where setcap does not need inheritanceJörg Mayer1-1/+1
svn path=/trunk/; revision=54708
2014-01-11Link wiretap library with tfshark. This is hopefully a "temporary" fix as ↵Michael Mann1-0/+1
the plan is to not have tfshark depend on wiretap. From Michal Labedzki svn path=/trunk/; revision=54697
2014-01-08At least some of the files in PLATFORM_CAPTURE_SRC are needed byGuy Harris1-1/+1
programs that use {lib,win}pcap but that don't capture traffic, such as rawshark; rename it to PLATFORM_PCAP_SRC, to match CMake. svn path=/trunk/; revision=54671
2014-01-08Rename PLATFORM_SRC to PLATFORM_CAPTURE_SRC, to match the CMake name.Guy Harris1-1/+1
svn path=/trunk/; revision=54669
2014-01-08TFShark (Terminal Fileshark) v.001. Bug 9607 ↵Michael Mann1-4/+37
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2014-01-02Stop building and distributing the asn1 plugin. I bleleve it to be obsolete.Anders Broman1-1/+0
svn path=/trunk/; revision=54559
2013-12-13Add a "captype" file that just reports the type of a capture file, basedGuy Harris1-3/+13
on what libwiretap thinks it is. Update some comments to reflect the death of the hack used to include (libwiretap) plugin support in programs not built with libwireshark. svn path=/trunk/; revision=54015
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-16 08:28:36 +0000