aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
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
2013-12-02Move most of the plugin code from epan to wsutil and remove allGuy Harris1-6/+9
knowledge of particular types of plugins. Instead, let particular types of plugins register with the common plugin code, giving a name and a routine to recognize that type of plugin. In particular applications, only process the relevant plugin types. Add a Makefile.common to the codecs directory. svn path=/trunk/; revision=53710
2013-11-26Overhaul rpm-building options a bit: as suggested by Anders, have the RPM followJeff Morriss1-2/+4
./configure's options for gtk2 vs gtk3 vs qt. Make it possible to not build the GNOME package (now both UIs' packages are optional). I think Chris requested this a while ago. If this works out it may make sense to control the rest of the options via ./configure . svn path=/trunk/; revision=53607
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-11From Michael Bean via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9384 :Pascal Quantin1-0/+1
Add support for Alcatel-Lucent 8950 AAA svn path=/trunk/; revision=53258
2013-10-29Make it so out-of-tree builds (autofoo and cmake) have access to the variousJeff Morriss1-1/+1
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-22Revert "Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9209 :"Balint Reczey1-1/+0
This reverts commit r52441. svn path=/trunk/; revision=52772
2013-10-07Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9209 :Jeff Morriss1-0/+1
Debian still uses XPMs for their menu system[1] so distribute wsicon32.xpm in the source tarball again (reverting part of r48565). This is the icon that debian/wireshark.menu refers to. [1] http://lintian.debian.org/tags/menu-icon-not-in-xpm-format.html svn path=/trunk/; revision=52441
2013-10-01Use separate "Read me first" files for Qt and GTK+.Gerald Combs1-1/+1
svn path=/trunk/; revision=52321
2013-09-30Make sure we copy Wireshark's libraries to Frameworks. Use top_builddirGerald Combs1-1/+1
instead of top_srcdir. It shouldn't make any difference in our case but it's more correct. svn path=/trunk/; revision=52302
2013-09-30Fix compile when use gzip from make dist-gzip (Missing some images)Alexis La Goutte1-0/+2
svn path=/trunk/; revision=52284
2013-09-13Move debian-setup.sh into tools/Jeff Morriss1-1/+0
svn path=/trunk/; revision=52023
2013-08-21Make it possible to add custom Diameter AVP .xml files and distribute them ↵Anders Broman1-1/+2
by adding the file name to separate files and leave the "normal" makefiles untouched. svn path=/trunk/; revision=51457
2013-08-21Arrange that "make distcheck" use the GUI configure flags used toGuy Harris1-0/+1
configure Wireshark, so we don't, for example, do "make distcheck" with no options, and thus default to GTK+ 3, on a system without GTK+ 3 where Wireshark was configured with --with-gtk2. (This also means that if we're configuring only with Qt, or with GTK+ *and* Qt, "make distcheck" will check with those.) svn path=/trunk/; revision=51456
2013-08-07Switch to make-services.py. Fix some variable names and version tests.Gerald Combs1-1/+1
svn path=/trunk/; revision=51189
2013-07-25Make it easier to add custom (proprietary) Diameter XML files.Jeff Morriss1-0/+1
svn path=/trunk/; revision=50889
2013-07-25Reinstate r47243 (i.e., revert r50869): with the old way "make distcheck"Jeff Morriss1-2/+1
fails. Fix radius/Custom.make so that automake likes it (remove the \ followed by nothing). Once that's done, make the inclusion of that file mandatory so that it actually (as I supposed--incorrectly--would happen in r47243) gets distributed in the source tarball. svn path=/trunk/; revision=50883
2013-07-24The files in aclocal-fallback are copies of .m4 files from variousGuy Harris1-1/+0
packages, providing macros that we use in our configure script in case somebody building from SVN doesn't happen to have the package installed and thus doesn't happen to have those macros defined. In the case of Qt, there *isn't* such a .m4 file, so we had to create the macro. Move it to acinclude.m4, and rename it to AC_WIRESHARK_QT_CHECK to indicate that it's our own check. svn path=/trunk/; revision=50881
2013-07-24Use the dist_ prefix for the _DATA variables. That way we don't have toJeff Morriss1-14/+7
explicitly add them to the distribution (via EXTRA_DIST). svn path=/trunk/; revision=50878
2013-07-24Revert ↵Anders Broman1-0/+1
http://anonsvn.wireshark.org/viewvc/trunk/Makefile.am?r1=47243&r2=47242&pathrev=47243 Config.nmake is needed when doing "make install" on a build from a tarball. svn path=/trunk/; revision=50869
2013-07-18Fix copy/paste errorPascal Quantin1-1/+0
svn path=/trunk/; revision=50727
2013-07-18From Anders: add Verizon Wireless dictionaryPascal Quantin1-2/+4
svn path=/trunk/; revision=50726
2013-07-15As suggest by Balint:Jeff Morriss1-1/+0
Remove the 03-preferences patch: there's an ongoing discussion over at Debian about using xdg-open to open URLs[1] (instead of sensible-browser as this patch was doing) and anyway xdg-open behaves better for Balint. Since we'll be using xdg-open, add a dependency on xdg-utils (also suggested by Balint). Both changes are untested. [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=172436 svn path=/trunk/; revision=50611
2013-07-15Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific ↵Jeff Morriss1-1/+0
there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark). svn path=/trunk/; revision=50598
2013-07-12Note the issue with setting program_LINK.Guy Harris1-0/+6
svn path=/trunk/; revision=50545
2013-07-12Setting wireshark_LINK means that wireshark_LDFLAGS isn't used; there'sGuy Harris1-1/+0
no need to set it for the GTK+ version, so don't. (For Qt, we should find some other way of forcing it to link wireshark-qt as a C++ program, perhaps by having a wireshark-qt.cpp file in the top-level source directory that contains main() and that calls the ui/qt code.) svn path=/trunk/; revision=50544
2013-07-12Revert a change that shouldn't have been checked in.Guy Harris1-1/+1
svn path=/trunk/; revision=50530
2013-07-12print.ps moved to epan.Guy Harris1-2/+2
svn path=/trunk/; revision=50529
2013-07-12Move the print modules into epan.Jeff Morriss1-3/+0
svn path=/trunk/; revision=50526
2013-07-09Use older versions of some libraries, and build 32-bit, when buildingGuy Harris1-0/+1
for Leopard. Fix some issues that came up with the older versions. We don't support building *on* Leopard - we check for that up front - so eliminate some code to handle that. When uninstalling, check for the installed version by looking at the name of the -done file, so we don't have to trust the _VERSION settings. We don't appear to need to build our own versions of libpng or pixman when building *on* Snow Leopard *for* Leopard. The libffi configure patch for GLib appears not to be necessary - perhaps building and installing pkg-config *before* building GLib makes it no longer necessary - and it doesn't work with older versions of GLib, so don't apply it. svn path=/trunk/; revision=50456
2013-07-06Add a --enable-osx-deploy-target option to set the deployment targetGuy Harris1-1/+1
when building for OS X; that causes the MACOSX_DEPLOYMENT_TARGET environment variable to be set when building (so that, for example, we don't use linker features available on the version on which we're building but not on the minimum OS version for which we're building), and causes the SDK for that version to be used (so that, for example, we don't link with libraries with later version numbers than the ones provided with the OS version for which we're building). svn path=/trunk/; revision=50410
2013-06-27Don't assume the system include files are under /usr/include; trick theGuy Harris1-0/+1
compiler into saying where they are, and use that. Patch a bug in PortAudio pa_stable_v19_20111121 that clang found. svn path=/trunk/; revision=50186
2013-06-26Don't link wireshark against the Qt libraries and don't like wireshark-qtJeff Morriss1-5/+3
against the Gtk+ libraries. (I didn't notice this before because the resulting programs aren't, on my system, actually linked against the libraries they don't use--presumably because of the "-Wl,--as-needed" flag.) svn path=/trunk/; revision=50170
2013-06-25Last changes to autofoo, rename the files as they live now in their own dir...Luis Ontanon1-8/+6
svn path=/trunk/; revision=50152
2013-06-25Allow the Gtk+ and Qt versions to be built simultaneously (with autotools).Jeff Morriss1-29/+39
./configure now accepts: --with-gtk2 : enabled by default; exclusive of --with-gtk3 --with-gtk3 : disabled by default; exclusive of --with-gtk2 --with-qt : disabled by default, can be specified with gtk --enable-wireshark : controls whether *any* GUI is built If Qt is enabled then a new program is created: "wireshark-qt". "wireshark" remains the Gtk+ version. svn path=/trunk/; revision=50147
2013-06-25This should get cmake to ignore echld...Luis Ontanon1-5/+29
svn path=/trunk/; revision=50141
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 19:27:14 +0000