aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2011-11-22Unconditionally install idl2wrsrbalint1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39985 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-22hardcode /bin/sh to idl2wrsrbalint1-7/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39984 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-17Add an SVN_REVISION variable to config.nmake. This can be used togerald1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39891 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-02We have to remove svnversion.h with "make distclean".guy1-2/+7
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39720 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-02The answer toguy1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39716 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-25Forward-port r39581 from the 1.6 trunk.gerald1-1/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39582 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-25In dist-hook, don't try to copy version.conf if it already exists in thegerald1-1/+1
destination directory. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39572 f5534014-38df-0310-8fa8-9805f1628bb7
2011-09-24Use one of the new icons for remote interfaces.tuexen1-0/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39118 f5534014-38df-0310-8fa8-9805f1628bb7
2011-09-08Revert rev 38340 (which was itself a reversion of 34807): if we can't find themorriss1-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?) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38933 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-31Remove tree-view-ui.xml and bytes-view-ui.xmlstig1-3/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38815 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-28Escape the newlines in the definition of ui_DATA.guy1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38763 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-28Add the main menubar UI description.etxrab1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38762 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-28Add the treeView popup UI description.etxrab1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38760 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-28Install the GUI xml files. I'm not sure about the Makefile.am changes pkease ↵etxrab1-0/+8
check. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38756 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-23Remove support for libpcre, we use GRegex in GLib.stig1-5/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38683 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-21Add missing FindGTK3.cmakejmayer1-29/+30
Reorder cmake modules to match directory listing order git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38153 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-15Patch GnuTLS's pkg-config file; it says "requires zlib", but OS X, whileguy1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38055 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-15Add Joerg Mayer's macos-setup.sh script, modified to add an "x" afterguy1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38053 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-27Remove compile and ylwrap when 'make maintainer-clean'.stig1-1/+3
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37797 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-11Do the Python embedding similarly to other "default = yes, if available"guy1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37652 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-09From Madhusudhan M:etxrab1-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 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37627 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-08From Michael Mann:etxrab1-1/+0
Make interlink built-in dissector (from plugin). https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6005 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37610 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-07Move packet-sercosiii.c to be a builtin dissector.etxrab1-1/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37597 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-07Add more missing files.etxrab1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37593 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-07Add files to distribution.etxrab1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37589 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-31Add abi-descriptor.template to the distribution.gerald1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37490 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-31Add top-level dumpabi target.rbalint1-0/+5
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37476 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-27Remove some stuff again.etxrab1-7/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37437 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-27Include missing files in distribution.etxrab1-0/+9
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37435 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-26Add FindGMODULE2.cmake and FindGTHREAD2.cmake to the dist.etxrab1-0/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37409 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-25Add new dictionary from freeradius.org: GIT 2.1.x branch.wmeier1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37385 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-24Update list of radius dictionary files to reflect adds/deletes.wmeier1-2/+12
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37380 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-19Add pdml2html.xsl to the source tarball.guy1-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?) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37314 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-19From Dirk Jagdmann via bug 5875:gerald1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37298 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-12More OS X installer fixes and tweaks.gerald1-0/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37107 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-12Another attempt to fix the OS X .dmg builds.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37106 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-13capinfos and editcap need PYTHON_DIR when we have Python enabled.gerald1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36626 f5534014-38df-0310-8fa8-9805f1628bb7
2011-01-04Drop Python dissectors directory flag from programs that don't have dissectors.jake1-5/+5
Win32: remove superfluous dumpcap build dependancy on wiretap. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35365 f5534014-38df-0310-8fa8-9805f1628bb7
2011-01-04Free dumpcap from linking to wiretap.jake1-1/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35353 f5534014-38df-0310-8fa8-9805f1628bb7
2010-12-06Update the location of make-manuf.gerald1-1/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35133 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-26Move native Win32 code to its own directory and out of gtk directory ↵sfisher1-0/+5
(hopefully without breaking any builds) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35032 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-18From Taras Kotov: etxrab1-0/+1
Add RADIUS dictionary for vendor Eltex. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5415 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34943 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-16Split libui into libui and libui_dirty. The latter contains (only)morriss1-1/+2
text_import_scanner.c (which is generated and not by us so we can't guarantee that it's clean). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34912 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-13Add a wireshark file stock icon.etxrab1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34496 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-04Don't remove the services file. It isn't built in the same way thatgerald1-2/+1
sminmpec.c is. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34373 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-04Copy make-sminmpec.pl to make-services.pl and modify it to fetch thegerald1-1/+5
IANA port-numbers file and save it to "services". Use it to update "services". git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34371 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-03Remove the up/down arrow images. They haven't been used in a very longgerald1-2/+0
time. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33693 f5534014-38df-0310-8fa8-9805f1628bb7
2010-07-15Only link programs that call stuff in Application Services or Coreguy1-4/+5
Foundation with those frameworks. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33541 f5534014-38df-0310-8fa8-9805f1628bb7
2010-07-15Move the code to get version information for libraries used byguy1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33531 f5534014-38df-0310-8fa8-9805f1628bb7
2010-06-30Add Visual C++ project files to the distribution.gerald1-1/+6
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33386 f5534014-38df-0310-8fa8-9805f1628bb7
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 11:01:26 +0000