summaryrefslogtreecommitdiff
path: root/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2012-12-19Add a new target: install_desktop_files which installs some files forJeff Morriss1-0/+18
use with a freekdesktop (at least I think so). This stuff was taken from Fedora's Wireshark RPM. The intent is to a) use Wireshark's own files and b) remove most of the manual installation steps from RPMs. svn path=/trunk/; revision=46623
2012-12-19Add wireshark-mime-package.xml to EXTRA_DIST.Jeff Morriss1-0/+1
svn path=/trunk/; revision=46621
2012-12-19As suggested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8076 :Jeff Morriss1-2/+3
Enable PIE (if the compiler supports it) when compiling dumpcap. Do this regardless of whether we're configured to install dumpcap setuid-root because some users will end up running dumpcap as root regardless of how we were configured. svn path=/trunk/; revision=46608
2012-12-18text2pcap needs only the wsutil lib, not the wiretap lib (as far as I can see).Michael Tüxen1-1/+0
svn path=/trunk/; revision=46600
2012-12-05Create 16x16 and 24x24 versions of the document icon with a contrastingGerald Combs1-1/+2
border. Add them as pixbufs to ui/gtk/toolbar_icons.h and use them to replace the file icon XPM in stock_icons.c. Add modelines. svn path=/trunk/; revision=46413
2012-11-27From report of Joerg Wunsch via ↵Alexis La Goutte1-0/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7973 QRC files are missing in 1.8.3/SVN release tarball Fix : CMake Error at /usr/share/cmake-2.8/Modules/Qt4Macros.cmake:187 (FILE): file Internal CMake error when trying to open file: /wireshark-1.9.0-SVN/ui/qt/i18n.qrc for reading. Call Stack (most recent call first): ui/qt/CMakeLists.txt:139 (QT4_ADD_RESOURCES) ... From me: Add missing files (*.qrc, qtshark.pro...) to ui/qt/Makefile.common svn path=/trunk/; revision=46217
2012-11-22On UN*X, if an interface has a description, use it as the "friendlyGuy Harris1-1/+7
name". If it doesn't have a description, on OS X, use the System Configuration framework to attempt to get a "friendly name" for interfaces. If a loopback device doesn't have a friendly name, give it "Loopback" as the friendly name. Move the "turn a CFString into a mallocated C string" routine into common code, as it's used in more than one place. svn path=/trunk/; revision=46131
2012-11-22Assume, at least for now, that "Darwin" means "OS X"; don't botherGuy Harris1-5/+5
checking whether the relevant frameworks are available. (An iOS port's going to require a *lot* more work, and I don't know whether Darwin-the-pure-OS even builds and runs any more.) We don't need Core Services any more, as we're no longer using Gestalt(). We just need Core Foundation for getting the OS version and Application Services for firing up Web browser or file manager windows. svn path=/trunk/; revision=46129
2012-11-22Fix indentation.Guy Harris1-2/+2
svn path=/trunk/; revision=46126
2012-11-19From Mike Garratt:Anders Broman1-0/+2
Friendly Names for interfaces on Windows Notes on the changes the patch covers: * if_info_t struct: addition of friendly_name * Dumpcap Interface list format changes: + Win32: "dumpcap -D" shows friendly_name in place of descript if known + All: machine interface "dumpcap -D -Z none" includes friendly_name in the list in addition to the existing parameters * interface_options struct: addition of console_display_name + When an interface name is displayed in a console, it will typically be the console_display_name (instead of name). + console_display_name is used as the basis of the autogenerated temp filenames + console_display_name is typically set to the friendly_name if known, otherwise it is set to the interface name * Enhancements to capture_opts_add_iface_opt() (the function which process -i options). + Can now specify the interface using its name and friendly_name + Interface name matching is case insenstive + Name matching first attempts exact matching, then falls back to prefix matching (e.g. dumpcap -i local) + Validates interface names, instead of blindly sending them off to winpcap/libpcap + Interface specification by number is still supported. * capture_opts_trim_iface() has been refactored: + Instead of repeating a decent chunk of the cost in capture_opts_add_iface_opt(), it calls capture_opts_trim_iface() to specify the interface. * introduction of capture_win_ifnames.[ch] (windows only code) + Implements static function GetInterfaceFriendlyNameFromDeviceGuid() - a windows version independant function to convert an interface guid into its friendly name. Uses published api functions on windows vista and higher, but falls back to unpublished API functions on older windows releases. + void get_windows_interface_friendlyname(/* IN */ char *interface_devicename, /* OUT */char **interface_friendlyname); - extracts the GUID from the interface_devicename, then uses GetInterfaceFriendlyNameFromDeviceGuid() to do the resolution * Auto temp filename generation: + Now uses wireshark_pcapng_* or wireshark_pcap_* depending on file format + Basis temp filename format on console_display_name + Win32: if console_display_name is a windows interface guid, extracts numbers from GUID here (instead of in interface option processing) GUI CHANGES: * Dialog that displays when you click the "Manage Interfaces" button (within Capture Options dialog) has been renamed from "Add new interfaces" to "Interface Management" * ui/gtk/capture_dlg.c: new_interfaces_w variable renamed to interface_management_w * Win32: Local Interfaces tab on Interface Management dialog, shows includes friendly name as far left column * Interface Management dialog defaults to larger size on win32 - so it fits without resizing local interfaces tab * Interface Management dialog now saves preferences when you click the apply button (local hidden interfaces was not persisting across restarts) * Tweaks: "Interface Details" dialog (Interface list->Capture Interfaces -> Details): + "Friendly Name" renamed to "NDIS Friendly Name" + Added "OS Friendly Name" to the top of the list * Win32: The "Capture Interfaces" dialog now shows the friendly name instead of device guid * Welcome screen: + The height of the interface list scrollbox dynamically adjusts & updates to the number visible interfaces. Up to 10 interfaces can be listed without a scroll bar, the minimum height is for 2 interfaces. + Win32: now shows just the Friendly Name if known - in place of "Interfacename_Guid:(Description)" svn path=/trunk/; revision=46083
2012-10-21Revert r45692 and try to fix link failure another way: console_win32.[ch] ↵Pascal Quantin1-0/+2
definitely belong to ui/win32 Add console_win32.[ch] to Makefile.am svn path=/trunk/; revision=45693
2012-10-12Include setup.ini in the tarball.Anders Broman1-0/+1
Copy setup.ini to etc/gtk-3.0 svn path=/trunk/; revision=45497
2012-10-09- Add Nokai Siemens Networks AVP.Anders Broman1-1/+2
- Add a few enums to Event-Trigger - Reformat the Nokia file a bit. svn path=/trunk/; revision=45427
2012-10-08From GeorgiaK:Anders Broman1-1/+2
Add Nokia AVP:s https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7799 svn path=/trunk/; revision=45385
2012-10-04Remove the previous distribution file.Gerald Combs1-1/+1
svn path=/trunk/; revision=45328
2012-10-04Add a "patch-bzip2" target which creates a patch from the previous microGerald Combs1-0/+22
release. svn path=/trunk/; revision=45323
2012-09-24From Jim Young, bug 7745.Martin Mathieson1-1/+11
Add Makefile support for reordercap. svn path=/trunk/; revision=45090
2012-09-14libgtkui_dirty → libui_dirty.Gerald Combs1-1/+1
svn path=/trunk/; revision=44907
2012-08-19Make sure osx-dmg.sh is executable.Gerald Combs1-0/+1
svn path=/trunk/; revision=44573
2012-08-12Patching configure.in files and regenerating them is a bag of hurt, asGuy Harris1-1/+0
it can depend on, among other things, having the the relevant .pc files in one of the directories in PKG_CONFIG_PATH. Instead, just don't request a fat build of PortAudio. svn path=/trunk/; revision=44457
2012-08-11Add some patches to make PortAudio build with the macosx-setup.shGuy Harris1-0/+2
script. svn path=/trunk/; revision=44446
2012-08-10Add diameter/AlcatelLucent.xml to the distribution.Anders Broman1-1/+2
svn path=/trunk/; revision=44424
2012-07-31(Attempt to) reflect the file moves from r44165.Jeff Morriss1-27/+45
svn path=/trunk/; revision=44174
2012-07-23README.dfilter is no more.Jeff Morriss1-1/+0
svn path=/trunk/; revision=43943
2012-07-20WiMAX OFDMA PHY SAP dissector plugin ↵Michael Mann1-1/+2
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2695) svn path=/trunk/; revision=43844
2012-07-03Expand that comment to note that there's no guarantee that GLIB_LIBS hasGuy Harris1-0/+3
-gmodule or that GTK_LIBS doesn't have it. svn path=/trunk/; revision=43564
2012-07-03As per Gentoo bug 423743Guy Harris1-6/+20
https://bugs.gentoo.org/show_bug.cgi?id=423743 "The Makefile.am claims including GLIB_LIBS when linking wireshark is unnecessary, because wireshark links to GTK_LIBS which is a superset. It is not actually a superset: gmodule is included in GLIB_LIBS but not in GTK_LIBS (unless accidentally on older glibs/gtks)." so we must explicitly link with GLIB_LIBS. Update the comment to reflect that - and to reflect that GTK+ doesn't necessarily run atop X11 - while we're at it. Fixes bug 7427. #BACKPORT svn path=/trunk/; revision=43561
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-06-25Revert 43481: linking dftest against libui was not the problem.Jeff Morriss1-0/+1
svn path=/trunk/; revision=43488
2012-06-25Move get_args_as_string from ui/util.c into wsutil (maybe not to the bestJeff Morriss1-1/+0
module, but...). This makes dftest no longer dependent on libui, so stop linking against it. svn path=/trunk/; revision=43481
2012-06-21It's FindNL.cmake not FindLIBNL.cmakeJeff Morriss1-1/+1
svn path=/trunk/; revision=43423
2012-06-20Complete cmake support for netlink detectionJörg Mayer1-0/+1
svn path=/trunk/; revision=43421
2012-06-19AAAAARGH. Making the UI libs platform-dependent breaks dependencyGuy Harris1-2/+3
checking, so if a UI library changes Wireshark won't be relinked with it. Revert the change that made them platform-dependent; we may end up having to have separate targets for GTK+ Wireshark and Qt Wireshark. svn path=/trunk/; revision=43384
2012-06-19Don't install idl2wrs except in Debian's special wireshark-dev package.Jeff Morriss1-1/+0
(Normal Wireshark installations can't be used to develop dissectors so there's no need to install it or its man page.) http://www.wireshark.org/lists/wireshark-dev/201206/msg00073.html (The Debian changes are untested.) svn path=/trunk/; revision=43370
2012-06-19Don't install main-menubar-ui.xmlAnders Broman1-8/+0
svn path=/trunk/; revision=43368
2012-06-18The toolkit-dependent UI library, well, depends on the toolkit. Make itGuy Harris1-3/+2
so. svn path=/trunk/; revision=43329
2012-06-15Don't install the Qt resource images. They get converted to C arrays inGerald Combs1-25/+0
qrc_*.cpp so they shouldn't be necessary even when we're building and installing qtshark. svn path=/trunk/; revision=43274
2012-06-11Add TGPPS9.xml to makefile and NSIS installerPascal Quantin1-0/+1
svn path=/trunk/; revision=43202
2012-06-01Make packet-coseventcomm.c a bultin dissectorAnders Broman1-1/+0
svn path=/trunk/; revision=42974
2012-05-30The GIOP plugin is now one big plugin (instead of 2, or was it 4?).Jeff Morriss1-2/+1
svn path=/trunk/; revision=42929
2012-04-04Add a "-build" argument to checkAPIs.pl. Use that argument when buildingJeff Morriss1-1/+1
from makefiles (and thus from the buildbot). The intention is to be able to tell when a human is running the tool so we can provide more code-review guidance. As a starter, enable the "too many proto_tree_add_text() calls" check when a human is running the tool. svn path=/trunk/; revision=41943
2012-03-30Remove the dependency on tools/make-services.pl for the services target.Gerald Combs1-1/+1
This is likely the cause of unwanted "services" file build attempts. svn path=/trunk/; revision=41853
2012-03-21Automake can, at times, be a delicate fragile flower. Apparently,Guy Harris1-17/+5
having something in wireshark_LDADD that's filled in by the configure script means that the items referred to by that string aren't treated as dependencies. svn path=/trunk/; revision=41709
2012-03-19Said hack didn't work.Guy Harris1-5/+0
svn path=/trunk/; revision=41665
2012-03-19Call the UI library in the Qt directory libqtui, not libui, to match theGuy Harris1-1/+1
UI library in the GTK+ directory. List the moc-generated and rcc-generated files as generated files. Add main_window.ui as an EXTRA_DIST file. Sort the EXTRA_DIST list. svn path=/trunk/; revision=41658
2012-03-18Take the source files out of uiqt_DATA.Guy Harris1-40/+1
svn path=/trunk/; revision=41649
2012-03-18Add automake support for Qt - use --with-qt as a configure scriptGuy Harris1-4/+22
argument. svn path=/trunk/; revision=41647
2012-03-14Update to glib 2.31.20.Michael Tüxen1-1/+0
One patch is not required anymore, since it has been included. svn path=/trunk/; revision=41546
2012-03-10Reflect the rename of the Xylan RADIUS dictionary.Guy Harris1-1/+1
svn path=/trunk/; revision=41476
2012-03-08Put more stuff from images into the release tarball.Guy Harris1-3/+11
svn path=/trunk/; revision=41420
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-30 18:48:53 +0000