aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
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
2012-03-07And one more image file.Guy Harris1-0/+1
svn path=/trunk/; revision=41408
2012-03-07Include the new images in the release tarball.Guy Harris1-0/+3
svn path=/trunk/; revision=41407
2012-02-22We need to build libui even if we're only building TShark. Fixes bugGuy Harris1-2/+2
6855. svn path=/trunk/; revision=41131
2012-02-19ui/cli now needs to be a distribution directory.Guy Harris1-1/+1
svn path=/trunk/; revision=41072
2012-02-19Build the TShark taps into a static libcliui library in the ui/cliGuy Harris1-20/+3
directory, and link TShark with that; let's see if this fixes the Windows buildbots. svn path=/trunk/; revision=41070
2012-02-19ui/gtk/main.c calls get_conn_cfilter(), which is defined in ui/util.c,Guy Harris1-1/+1
so we need to link libui *after* libgtkui. (It worked on Mac OS X, but the OS X linker might do things differently from the GNU linker.) svn path=/trunk/; revision=41063
2012-02-18Create a libui (static) library in the ui directory, which contains theGuy Harris1-1/+6
object files from all the source files in the ui directory (but not in its subdirectories), and link the programs that need it with them. This cleans things up a little bit, and may also fix the Windows build. svn path=/trunk/; revision=41061
2012-02-18Rename the (static) library built from stuff in ui/gtk to "libgtkui" inGuy Harris1-2/+2
automake/autoconf and nmake builds, to match the name in CMake builds. svn path=/trunk/; revision=41058
2012-01-28Add the Qt files to the tarball.Anders Broman1-0/+64
svn path=/trunk/; revision=40745
2012-01-21Sync checkapi target with Makefile.common.Michael Tüxen1-12/+12
svn path=/trunk/; revision=40630
2012-01-16Make the win32 directory a subdirectory of the ui directory.Guy Harris1-5/+5
svn path=/trunk/; revision=40531
2012-01-15Move gtk to ui/gtk.Jörg Mayer1-8/+8
This looses the last checkin to gtk, will add this manually back. svn path=/trunk/; revision=40518
2011-11-22Unconditionally install idl2wrsBalint Reczey1-1/+1
svn path=/trunk/; revision=39985
2011-11-22hardcode /bin/sh to idl2wrsBalint Reczey1-7/+1
svn path=/trunk/; revision=39984
2011-11-17Add an SVN_REVISION variable to config.nmake. This can be used toGerald Combs1-12/+0
retrieve our SVN revision in releases. Use make-version.pl to set all version information. Be more explicit about the tasks it performs: - Fetching the SVN revision which corresponds to our code. The revision can be fetched via "svn info", "git svn info", SubWCRev", config.nmake, or by prodding .svn. - Setting the version numbers (the "major.minor.micro" triplet). - Setting the release information (revision/build number, local build identifier) Remove the "is_release" configuration option and dist-hook target. When run with a "--set-*" option or no options make sure we leave a valid svnversion.h behind. svn path=/trunk/; revision=39891
2011-11-02We have to remove svnversion.h with "make distclean".Guy Harris1-2/+7
svn path=/trunk/; revision=39720
2011-11-02The answer toGuy Harris1-6/+1
XXX - "svnversion.h" is distributed in the release tarball; should we be deleting it with "make clean", or should we only do that with "make maintainer-clean"? is probably "we should only do that with "make maintainer-clean""; see http://www.wireshark.org/lists/wireshark-dev/201111/msg00027.html and followups. svn path=/trunk/; revision=39716
2011-10-25Forward-port r39581 from the 1.6 trunk.Gerald Combs1-1/+4
svn path=/trunk/; revision=39582
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 23:53:27 +0000