Commit Graph

1205 Commits

Author SHA1 Message Date
Gerald Combs 99f457bd03 Use separate "Read me first" files for Qt and GTK+.
svn path=/trunk/; revision=52321
2013-10-01 21:04:13 +00:00
Gerald Combs 5687b33b4e Make sure we copy Wireshark's libraries to Frameworks. Use top_builddir
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-30 17:19:48 +00:00
Alexis La Goutte 098819b3bc Fix compile when use gzip from make dist-gzip (Missing some images)
svn path=/trunk/; revision=52284
2013-09-30 08:38:00 +00:00
Jeff Morriss d179a1b788 Move debian-setup.sh into tools/
svn path=/trunk/; revision=52023
2013-09-13 21:06:08 +00:00
Anders Broman 61d2e64163 Make it possible to add custom Diameter AVP .xml files and distribute them by adding the file name to separate files and leave the "normal" makefiles untouched.
svn path=/trunk/; revision=51457
2013-08-21 19:53:57 +00:00
Guy Harris d9ebff02be Arrange that "make distcheck" use the GUI configure flags used to
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-21 18:39:39 +00:00
Gerald Combs 2dab57f425 Switch to make-services.py. Fix some variable names and version tests.
svn path=/trunk/; revision=51189
2013-08-07 16:33:39 +00:00
Jeff Morriss 35e220513c Make it easier to add custom (proprietary) Diameter XML files.
svn path=/trunk/; revision=50889
2013-07-25 15:40:39 +00:00
Jeff Morriss 285a439021 Reinstate r47243 (i.e., revert r50869): with the old way "make distcheck"
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-25 01:01:58 +00:00
Guy Harris f317c7821d The files in aclocal-fallback are copies of .m4 files from various
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-24 22:34:44 +00:00
Jeff Morriss 0e60bd6e40 Use the dist_ prefix for the _DATA variables. That way we don't have to
explicitly add them to the distribution (via EXTRA_DIST).

svn path=/trunk/; revision=50878
2013-07-24 20:54:15 +00:00
Anders Broman b5167576d3 Revert 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-24 17:34:09 +00:00
Pascal Quantin 6dd1cb7f8e Fix copy/paste error
svn path=/trunk/; revision=50727
2013-07-18 09:32:36 +00:00
Pascal Quantin d64dbd371b From Anders: add Verizon Wireless dictionary
svn path=/trunk/; revision=50726
2013-07-18 09:27:10 +00:00
Jeff Morriss 891854ca7a As suggest by Balint:
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-15 14:31:35 +00:00
Jeff Morriss 54bb2e7a5c Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific 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-15 02:48:26 +00:00
Guy Harris 0f80d54426 Note the issue with setting program_LINK.
svn path=/trunk/; revision=50545
2013-07-12 22:28:37 +00:00
Guy Harris 31f37c2bce Setting wireshark_LINK means that wireshark_LDFLAGS isn't used; there's
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-12 22:06:54 +00:00
Guy Harris 278567c4ee Revert a change that shouldn't have been checked in.
svn path=/trunk/; revision=50530
2013-07-12 07:29:05 +00:00
Guy Harris 5be96e7552 print.ps moved to epan.
svn path=/trunk/; revision=50529
2013-07-12 07:27:55 +00:00
Jeff Morriss 4dcc156cf3 Move the print modules into epan.
svn path=/trunk/; revision=50526
2013-07-12 03:50:50 +00:00
Guy Harris ff15b893d8 Use older versions of some libraries, and build 32-bit, when building
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-09 04:41:34 +00:00
Guy Harris 519c5affa2 Add a --enable-osx-deploy-target option to set the deployment target
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-07-06 16:42:30 +00:00
Guy Harris f3f156073b Don't assume the system include files are under /usr/include; trick the
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-27 10:30:33 +00:00
Jeff Morriss 681efb2de3 Don't link wireshark against the Qt libraries and don't like wireshark-qt
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-26 15:12:50 +00:00
Luis Ontanon 0a060270b3 Last changes to autofoo, rename the files as they live now in their own dir...
svn path=/trunk/; revision=50152
2013-06-25 21:09:29 +00:00
Jeff Morriss fd95d841b8 Allow the Gtk+ and Qt versions to be built simultaneously (with autotools).
./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-25 19:51:53 +00:00
Luis Ontanon e200f6cbf9 This should get cmake to ignore echld...
svn path=/trunk/; revision=50141
2013-06-25 17:43:52 +00:00
Luis Ontanon a75e89c787 Revert --with-echld until I find out how to get it to work with Cmake...
:

svn path=/trunk/; revision=50138
2013-06-25 04:50:36 +00:00
Luis Ontanon 1c8b686eb0 --with-echld
svn path=/trunk/; revision=50137
2013-06-25 04:20:08 +00:00
Guy Harris c1d34d4be6 On OS X, get the interface type from the System Configuration framework.
svn path=/trunk/; revision=49486
2013-05-22 01:19:18 +00:00
Gerald Combs 6cbb955d00 Install the new global profiles and add them to the distribution.
svn path=/trunk/; revision=49122
2013-05-01 21:53:57 +00:00
Jeff Morriss d64f28d617 Remove cmake/modules/FindPYTHON.cmake from the source distribution.
svn path=/trunk/; revision=49109
2013-05-01 13:22:25 +00:00
Gerald Combs 9120bf883e Move the contents of wsar_html/core to wsar_html. Create tag files for
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-30 00:27:02 +00:00
Gerald Combs 098997e5fb Buildbot (via Twisted) sets a restrictive umask. Unset it before we run
Doxygen.

svn path=/trunk/; revision=49052
2013-04-26 18:23:05 +00:00
Gerald Combs ea5829c50b Add some Doxygen checks.
svn path=/trunk/; revision=49051
2013-04-26 17:49:00 +00:00
Gerald Combs e6434ae19e Update the main, epan, and ui Doxygen configuration files. Change the
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-26 00:07:42 +00:00
Anders Broman 393ea67924 Add a basic file for China Telecom AVP:s.
svn path=/trunk/; revision=49017
2013-04-24 16:51:57 +00:00
Jaap Keuter 182876540a Make that wssplash *underscore* dev dot png
svn path=/trunk/; revision=48608
2013-03-28 07:12:24 +00:00
Jaap Keuter 8bdb5aad20 Distribute the shiny new splash screen logos.
svn path=/trunk/; revision=48607
2013-03-28 06:50:40 +00:00
Gerald Combs 7f7fcfbd5d Fix dist.
svn path=/trunk/; revision=48593
2013-03-27 18:25:54 +00:00
Gerald Combs d38a9f54c7 Add new capture toolbar icons.
svn path=/trunk/; revision=48571
2013-03-26 21:35:42 +00:00
Jeff Morriss 483aa2e079 Add wsicon128.png to the source distribution.
Install some more icon sizes (24x24 and 128x128) when installing desktop files.

svn path=/trunk/; revision=48570
2013-03-26 21:01:32 +00:00
Gerald Combs a0a1082e01 Fix dist.
svn path=/trunk/; revision=48567
2013-03-26 20:28:04 +00:00
Gerald Combs d1b87423df More icon updates.
Use the PNG versions of the new application icons.

Remove the XPM versions of the Wireshark application and capture icons.
To paraphrase Zoidberg, XPMs are bad and we should feel bad. Remove
xpm_to_widget_from_parent (which we weren't using and likely won't use
in the future).

Replace wiki_24.xpm (which was a GNOME or GTK+ stock icon IIRC) with the
16x16 and 24x24 versions emblem-web.png from GNOME icon theme 2.30.3.
This version was used specifically because it's GPLv2 and later versions
are GPLv3.

Update image/README.

svn path=/trunk/; revision=48565
2013-03-26 19:51:33 +00:00
Jaap Keuter 827eb58b04 From David Arnold:
Replace use of INCLUDES with AM_CPPFLAGS in all Makefiles to placate recent autotools.

svn path=/trunk/; revision=48261
2013-03-12 06:53:39 +00:00
Jeff Morriss 6eb2e2899a freekdesktop.org says all themes must fall back to 'hicolor' if they don't find
a theme-specific icon (and as such hicolor is where applications should
install their icons).  So: don't install some of our icons in the gnome area,
install them all in hicolor.

While we're at it, go ahead and install all the icon sizes we have.

If we're on SuSE, use their desktop-file-updater macro; without that they
won't recognize our desktop file.

Fix bug which prevented the MIME database from being updated if our install
prefix is not /usr .

svn path=/trunk/; revision=48204
2013-03-08 23:40:37 +00:00
Jeff Morriss 1a8a9a1b3a Don't have a separate srpm-package target: we already build the SRPM while building the RPM (since r47574).
svn path=/trunk/; revision=48105
2013-03-05 21:35:48 +00:00
Jeff Morriss 2c3a297f0f Move the install_desktop_files target so it's not in the middle of the various package-making targets.
svn path=/trunk/; revision=48103
2013-03-05 21:31:44 +00:00
Jeff Morriss 663e6a6d6b Make it so that alternate-prefix RPM builds actually work.
Use the prefix from 'configure' in the RPM (so: to build an RPM which installs
in /opt do "./configure --prefix=/opt && make rpm-package").

(Maybe this approach should also be used for the other options in the .spec
file.)

Only clean up if building the RPM was successful.

svn path=/trunk/; revision=47957
2013-02-28 23:02:38 +00:00