aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
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
2011-10-25In dist-hook, don't try to copy version.conf if it already exists in theGerald Combs1-1/+1
destination directory. svn path=/trunk/; revision=39572
2011-09-24Use one of the new icons for remote interfaces.Michael Tüxen1-0/+4
svn path=/trunk/; revision=39118
2011-09-08Revert rev 38340 (which was itself a reversion of 34807): if we can't find theJeff Morriss1-8/+17
SVN version, indicate that the SVN version is unknown. This puts back the fix for bug 1413. Add a new version.conf option for make-version which tell is "this is a build from a release tarball." When that option is present do not try to use SVN to determine the SVN version, just use whatever SVN information shipped in the tarball. If version.conf is present in the source tree (as it is only in the release branches), deliver it in the source tarball but only after setting the "this is a release tarball" option. All of this means that that builds from release-branch tarballs will report the SVN version of the release tarball rather than "unknown." This addresses the issue reported in http://ask.wireshark.org/questions/5376/wireshark-161-title-shows-svn-rev-unknown-from-unknown Builds from trunk (including the source tarballs) will continue to report that the SVN version is unknown. (Maybe that, too, should be changed?) svn path=/trunk/; revision=38933
2011-08-31Remove tree-view-ui.xml and bytes-view-ui.xmlStig Bjørlykke1-3/+1
svn path=/trunk/; revision=38815
2011-08-28Escape the newlines in the definition of ui_DATA.Guy Harris1-2/+2
svn path=/trunk/; revision=38763
2011-08-28Add the main menubar UI description.Anders Broman1-0/+1
svn path=/trunk/; revision=38762
2011-08-28Add the treeView popup UI description.Anders Broman1-0/+1
svn path=/trunk/; revision=38760
2011-08-28Install the GUI xml files. I'm not sure about the Makefile.am changes pkease ↵Anders Broman1-0/+8
check. svn path=/trunk/; revision=38756
2011-08-23Remove support for libpcre, we use GRegex in GLib.Stig Bjørlykke1-5/+0
svn path=/trunk/; revision=38683
2011-07-21Add missing FindGTK3.cmakeJörg Mayer1-29/+30
Reorder cmake modules to match directory listing order svn path=/trunk/; revision=38153
2011-07-15Patch GnuTLS's pkg-config file; it says "requires zlib", but OS X, whileGuy Harris1-0/+1
it supplies zlib, doesn't supply a pkgconfig file for it, so we don't want it to say "requires zlib". This script is part of the Wireshark source, so giving "download Wireshark source" as the next step doesn't make sense. svn path=/trunk/; revision=38055
2011-07-15Add Joerg Mayer's macos-setup.sh script, modified to add an "x" afterGuy Harris1-0/+3
"macos", to fix some bugs, to use "sudo" if necessary when installing, to make the library version numbers variables, and to download the optional libraries, by default, as well. Also add his patches to make GLib build and work. Update README.macos to reflect that. svn path=/trunk/; revision=38053
2011-06-27Remove compile and ylwrap when 'make maintainer-clean'.Stig Bjørlykke1-1/+3
svn path=/trunk/; revision=37797
2011-06-11Do the Python embedding similarly to other "default = yes, if available"Guy Harris1-0/+4
items. Add some quoting to the zlib tests, just in case the argument contains white space. Clean up capitalization of Lua and Python. Link programs that use libwireshark with the Python libraries, and build Epan with the Python cflags. svn path=/trunk/; revision=37652
2011-06-09From Madhusudhan M:Anders Broman1-1/+3
Cisco and Vodafone Diameter AVP:s I have axtracted the relevant vendor AVP:s and separated them out in Vendor specific xml files. Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5972 svn path=/trunk/; revision=37627
2011-06-08From Michael Mann:Anders Broman1-1/+0
Make interlink built-in dissector (from plugin). https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6005 svn path=/trunk/; revision=37610
2011-06-07Move packet-sercosiii.c to be a builtin dissector.Anders Broman1-1/+0
svn path=/trunk/; revision=37597
2011-06-07Add more missing files.Anders Broman1-0/+1
svn path=/trunk/; revision=37593
2011-06-07Add files to distribution.Anders Broman1-0/+1
svn path=/trunk/; revision=37589
2011-05-31Add abi-descriptor.template to the distribution.Gerald Combs1-0/+1
svn path=/trunk/; revision=37490
2011-05-31Add top-level dumpabi target.Balint Reczey1-0/+5
svn path=/trunk/; revision=37476
2011-05-27Remove some stuff again.Anders Broman1-7/+0
svn path=/trunk/; revision=37437
2011-05-27Include missing files in distribution.Anders Broman1-0/+9
svn path=/trunk/; revision=37435
2011-05-26Add FindGMODULE2.cmake and FindGTHREAD2.cmake to the dist.Anders Broman1-0/+2
svn path=/trunk/; revision=37409
2011-05-25Add new dictionary from freeradius.org: GIT 2.1.x branch.Bill Meier1-0/+1
svn path=/trunk/; revision=37385
2011-05-24Update list of radius dictionary files to reflect adds/deletes.Bill Meier1-2/+12
svn path=/trunk/; revision=37380
2011-05-19Add pdml2html.xsl to the source tarball.Guy Harris1-1/+2
(Can we have a macro that has everything in pkgdata_DATA except for COPYING, and use that macro in both the definition of pkgdata_DATA and EXTRA_DIST?) svn path=/trunk/; revision=37314
2011-05-19From Dirk Jagdmann via bug 5875:Gerald Combs1-1/+1
My attachment adds a link to a XSLT file to the preamble of the PDML. The XSLT will transform the PDML to a HTML page, and the HTML page features a look similar to Wireshark. See http://cubic.org/~doj/ebay/a.pdml for an example. The patch also contains a small perl program which converts the Wireshark colortable into javascript code which is used in the XSLT file. If you want to use a different color scheme you would execute the perl program and insert the generated javascript function into your XSLT file. To view the HTML you could either place the PDML and XSLT file on your webserver and verify that your webserver sends the PDML file as "text/xml". Then your webbrowser will find the linked XSLT file, download that as well and convert the PDML to HTML on the fly. You could also use an XSLT processor like xsltproc to convert the PDML and XSLT into a static HTML file. From me: Minor fixups. svn path=/trunk/; revision=37298
2011-05-12More OS X installer fixes and tweaks.Gerald Combs1-0/+4
svn path=/trunk/; revision=37107
2011-05-12Another attempt to fix the OS X .dmg builds.Gerald Combs1-1/+1
svn path=/trunk/; revision=37106
2011-04-13capinfos and editcap need PYTHON_DIR when we have Python enabled.Gerald Combs1-2/+2
svn path=/trunk/; revision=36626
2011-01-04Drop Python dissectors directory flag from programs that don't have dissectors.Jaap Keuter1-5/+5
Win32: remove superfluous dumpcap build dependancy on wiretap. svn path=/trunk/; revision=35365
2011-01-04Free dumpcap from linking to wiretap.Jaap Keuter1-1/+0
svn path=/trunk/; revision=35353
2010-12-06Update the location of make-manuf.Gerald Combs1-1/+0
svn path=/trunk/; revision=35133
2010-11-26Move native Win32 code to its own directory and out of gtk directory ↵Stephen Fisher1-0/+5
(hopefully without breaking any builds) svn path=/trunk/; revision=35032
2010-11-18From Taras Kotov: Anders Broman1-0/+1
Add RADIUS dictionary for vendor Eltex. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5415 svn path=/trunk/; revision=34943
2010-11-16Split libui into libui and libui_dirty. The latter contains (only)Jeff Morriss1-1/+2
text_import_scanner.c (which is generated and not by us so we can't guarantee that it's clean). svn path=/trunk/; revision=34912
2010-10-13Add a wireshark file stock icon.Anders Broman1-0/+1
svn path=/trunk/; revision=34496
2010-10-04Don't remove the services file. It isn't built in the same way thatGerald Combs1-2/+1
sminmpec.c is. svn path=/trunk/; revision=34373
2010-10-04Copy make-sminmpec.pl to make-services.pl and modify it to fetch theGerald Combs1-1/+5
IANA port-numbers file and save it to "services". Use it to update "services". svn path=/trunk/; revision=34371
2010-08-03Remove the up/down arrow images. They haven't been used in a very longGerald Combs1-2/+0
time. svn path=/trunk/; revision=33693
2010-07-15Only link programs that call stuff in Application Services or CoreGuy Harris1-4/+5
Foundation with those frameworks. svn path=/trunk/; revision=33541
2010-07-15Move the code to get version information for libraries used byGuy Harris1-2/+0
libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-06-30Add Visual C++ project files to the distribution.Gerald Combs1-1/+6
svn path=/trunk/; revision=33386
2010-06-05Back out r33088 for now.Gerald Combs1-1/+0
svn path=/trunk/; revision=33102
2010-06-04From Matt Poduska via bug 1957 (with minor changes):Gerald Combs1-0/+1
New dissector (plugin) to support decode of the EPCglobal Low-Level Reader protocol (see llrp.org for more information). This dissector has passed fuzz testing. svn path=/trunk/; revision=33088
2010-05-31Wireshark requires routines from libm, such as ceil(), so link with it;Guy Harris1-1/+1
we shouldn't rely on getting it pulled in by other shared libraries, as 1) there's no guarantee that the other shared libraries we use are linked with it or will continue to be linked with it; 2) there's no guarantee that we're even linking dynamically; 3) it fails on Fedora 13 as part of a change to catch programs that implicitly (or explicitly) assume, in their build procedures, that they'll get libraries linked in as a result of linking with other libraries. svn path=/trunk/; revision=33028
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 08:03:31 +0000