Commit Graph

1183 Commits

Author SHA1 Message Date
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
Jeff Morriss fe16b9835f Be a little quieter (and do a little more cleanup) when building RPMs.
svn path=/trunk/; revision=47944
2013-02-28 17:29:10 +00:00
Jeff Morriss f9324d29e7 Don't install the desktop-integration files in our (Wireshark's) data
directory (which is based on our installation prefix): there's no guarantee
that the desktop also uses the same prefix.

Add a note about how we might be able to find the desktop's data directory
should anyone actually run GNOME with a prefix other than /usr .

Also use 'desktop-file-install' to install the desktop file (if configure
found that command).

svn path=/trunk/; revision=47914
2013-02-27 16:08:16 +00:00
Balint Reczey d2e0724afc Add dumpabi targets to CMake builds
Also update automake generated targets to match CMake generated ones

svn path=/trunk/; revision=47879
2013-02-25 18:12:20 +00:00
Jeff Morriss 8f819bb5bf Also build the source RPM. Clean up after ourselves when done.
svn path=/trunk/; revision=47574
2013-02-08 19:14:37 +00:00
Alexis La Goutte 14780d9a0d Add new images to Makefile.am (needed when use make dist-*)
svn path=/trunk/; revision=47562
2013-02-08 10:14:09 +00:00
Jeff Morriss 3ae58ce943 Put all the aclocal-fallback files in the source distribution.
svn path=/trunk/; revision=47554
2013-02-08 02:53:53 +00:00
Jeff Morriss de92a29c0c Move move of the Qt checks into AM_PATH_QT.
svn path=/trunk/; revision=47553
2013-02-08 02:51:14 +00:00
Jeff Morriss 74cd935845 There is no longer any need to link wireshark.desktop and wireshark.png into the rpm/SOURCES directory.
svn path=/trunk/; revision=47534
2013-02-07 17:37:38 +00:00
Jeff Morriss 07546a7279 Fix installation of wireshark.desktop (create the directory first)
svn path=/trunk/; revision=47507
2013-02-06 02:45:22 +00:00
Jeff Morriss 47ed58ce0d Use DESTDIR when installing desktop files.
svn path=/trunk/; revision=47483
2013-02-05 03:58:56 +00:00
Guy Harris 74b8ef79b1 At least as I read
http://www.gnu.org/software/automake/manual/automake.html#index-g_t_0040code_007bAM_005fDEFAULT_005fVERBOSITY_007d-1018

this is the way to do the silent-rules stuff; using nested variable
expansion in Makefile.am causes warnings when running autogen.sh.

svn path=/trunk/; revision=47474
2013-02-04 18:53:50 +00:00
Gerald Combs c0ca6220ef Prettify more build output.
svn path=/trunk/; revision=47469
2013-02-04 17:22:32 +00:00
Guy Harris f2beeac1d0 Try creating a script for Debian and derivatives that will grab the
packages necessary for Wireshark development, using apt-get.

svn path=/trunk/; revision=47460
2013-02-04 00:29:27 +00:00
Guy Harris 58b5fc9ebf For Qt 5, we need to link with the QtWidgets and QtPrintSupport
libraries as well, at least on OS X.

svn path=/trunk/; revision=47437
2013-02-02 04:00:52 +00:00
Gerald Combs 7187abf120 Add $(AM_V_GEN) in a few more places.
svn path=/trunk/; revision=47434
2013-02-01 22:57:41 +00:00
Jeff Morriss 3f52d77072 Try not including radius/Custom.make in radius_DATA: I think including it means it gets distributed. (Anyway it's needed for building, it doesn't need to be installed.)
svn path=/trunk/; revision=47243
2013-01-24 02:26:43 +00:00
Anders Broman bbb0e8f802 Add an SKT.xml file.
svn path=/trunk/; revision=47227
2013-01-23 14:50:57 +00:00
Anders Broman 81bfbcc7e5 Missing space?
svn path=/trunk/; revision=47226
2013-01-23 14:40:17 +00:00
Anders Broman 90844413fe svn path=/trunk/; revision=47225 2013-01-23 13:12:38 +00:00
Anders Broman fceeb16e66 Make it possible to add custom radius dictionaries. Top Makefile.am needs more modifications to include the file in the tarball.
svn path=/trunk/; revision=47224
2013-01-23 12:08:15 +00:00
Gerald Combs 3d280a8c95 Replace more XPMs with PNGs.
svn path=/trunk/; revision=47159
2013-01-19 05:48:43 +00:00
Gerald Combs a50850c0cd Fix UI library dependency checking.
svn path=/trunk/; revision=46902
2013-01-02 19:19:10 +00:00