aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2016-05-19autotools: Add automake silent rule for ln -sJoão Valverde1-1/+1
Change-Id: Ic5b6fca04955384dc3d337ec74757f711216a372 Reviewed-on: https://code.wireshark.org/review/15468 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-05-11automake/nmake: don't run checkAPIs on lex and yacc files.Jeff Morriss1-2/+1
The lex files use malloc and friends which is prohibited; don't check them (until checkAPIs becomes smart enough to realize this is OK). This mirrors what is done in cmake. Change-Id: Ie80ea7a9b7c0e25c70c8edf3671e80a493ea1b2f Reviewed-on: https://code.wireshark.org/review/15377 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-21Link version code statically againJoão Valverde1-2/+9
This allows keeping the code-sharing with the static linking. This "fixes" a hypothetical ABI mismatch with wsutil and avoids pulling more external dependencies to wsutil than strictly necessary. A nice side-effect is that libwsutil no longer depends on version.h. Follow up to f95976eefcbeb5d24df383c29d29ef888b503945. Change-Id: I8f0d6a557ab3f7ce6f0e2c269124c89f29d6ad23 Reviewed-on: https://code.wireshark.org/review/15002 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-03Make the Flex scanners and YACC parser in libraries reentrant.Guy Harris1-3/+3
master-branch libpcap now generates a reentrant Flex scanner and Bison/Berkeley YACC parser for capture filter expressions, so it requires versions of Flex and Bison/Berkeley YACC that support that. We might as well do the same. For libwiretap, it means we could actually have multiple K12 text or Ascend/Lucent text files open at the same time. For libwireshark, it might not be as useful, as we only read configuration files at startup (which should only happen once, in one thread) or on demand (in which case, if we ever support multiple threads running libwireshark, we'd need a mutex to ensure that only one file reads it), but it's still the right thing to do. We also require a version of Flex that can write out a header file, so we change the runlex script to generate the header file ourselves. This means we require a version of Flex new enough to support --header-file. Clean up some other stuff encountered in the process. Change-Id: Id23078c6acea549a52fc687779bb55d715b55c16 Reviewed-on: https://code.wireshark.org/review/14719 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-24Add files by folder to distribution tarball (EXTRA_DIST)João Valverde1-0/+1
This takes away much of the pain (and merge conflicts) of micro-managing every sub-folder file. Change-Id: I7d7bb1173511ec9312ca4a97c6a59a26b0b194f4 Reviewed-on: https://code.wireshark.org/review/14595 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23Add pkg.m4 and remove aclocal-flags scriptJoão Valverde1-2/+0
Add pkg-config 0.29.1 macros to our distribution. This makes the aclocal-flags script obsolete, since we are already not using GLib autoconf macros. ACLOCAL_AMFLAGS need only be defined on the top-level Makefile.am. Change-Id: Idd868dcfeb8f279517970d0f96d9d53e3a7e4d5c Reviewed-on: https://code.wireshark.org/review/14568 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08Add EditorConfig settings for most C filesJoão Valverde1-0/+1
Change-Id: I02e6d71290bbdf7504437b0d670955b3686b6b52 Reviewed-on: https://code.wireshark.org/review/14360 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-03Revert "autotools: Use explicit zlib dependency build flags"João Valverde1-7/+2
This reverts commit 2bded0b66137a2f1c8b69911d91903a24f8a2624. Change-Id: Ic898c65df4daaa395eb010e0286d97509346d43a Reviewed-on: https://code.wireshark.org/review/14318 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-03autotools: Use explicit zlib dependency build flagsJoão Valverde1-2/+7
Use pkg-config if a zlib.pc file is available. Remove the now redundant AC_TRY_LINK_FUNC test (there are no linker flags for GTK+ here). Change-Id: I7de744749eba7231ae0097b975144b76ffcf1bdb Reviewed-on: https://code.wireshark.org/review/14263 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-21autotools: Use pkg-config autoconf macros for GLib/GTKJoão Valverde1-1/+3
Remove mostly obsolete aclocal macros. Make GTK build flags a strict superset of GLib flags. Use GTK build variables for GTK GUI and GLib elsewhere. Add dependency flags explicitly instead of using WS_CPPFLAGS. Some minor improvements and fixes for missing/unnecessary variables (no impact on our test builds). Change-Id: I3e1f067a875f79d6516c1fa7af986f17a7a6b671 Reviewed-on: https://code.wireshark.org/review/14005 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-11autotools: Add more silent build rulesJoão Valverde1-1/+1
Change-Id: I4abff8880d5b3ff439e6abc9cf3c2d17897501ea Reviewed-on: https://code.wireshark.org/review/13816 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-28autotools: Don't use "user variables" to set build flagsJoão Valverde1-13/+4
GNU coding standards recommend against it and automake is designed around it. This allows overriding the global build flags using AM_CFLAGS, etc., or per object flags, something that is difficult or impossible currently because of automake precedence rules. Change-Id: I3f1ea12e560af5a46b2f04b342b1882bbf123f12 Reviewed-on: https://code.wireshark.org/review/13455 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2015-12-05Revert "Build Flex-generated files with "warnings are errors"."Guy Harris1-8/+17
This reverts commit b56f53884be3bab935058b2bbbb4da0b8bbbe7f6. Sadly, we *do* get warnings at this point with older versions of Flex, such as the one on the 32-bit OS X buildbot. Change-Id: I9aec1a16e9f2e1bbcfaac3dffdabdd89af5815e3 Reviewed-on: https://code.wireshark.org/review/12443 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-05Build Flex-generated files with "warnings are errors".Guy Harris1-17/+8
We shouldn't be getting warnings at this point. Change-Id: I363a48546cb8d916425f42962ae1697d52ed9a29 Reviewed-on: https://code.wireshark.org/review/12436 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01autotools: Fix g212f2f1João Valverde1-1/+1
Change-Id: If7185885faea2319fdce4d89a7a9bf40312bcfa6 Reviewed-on: https://code.wireshark.org/review/12346 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-01autotools: Clean abi-check with maintainer-cleanJoão Valverde1-1/+8
Change-Id: Ia2ce54592485d2995bcfd56bd127a2fedb1a7d07 Reviewed-on: https://code.wireshark.org/review/12293 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-05Initialize 2.1.Gerald Combs1-1/+1
Change-Id: I515c53bb56cf82d1911b58f2cb2103afd0e597a5 Reviewed-on: https://code.wireshark.org/review/10810 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-021.99.9 → 1.99.10.Gerald Combs1-1/+1
Change-Id: I924be5b0e3c73a0bb8ae1361fa518ec10139e13d Reviewed-on: https://code.wireshark.org/review/10363 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-241.99.8 → 1.99.9.Gerald Combs1-1/+1
Change-Id: I014399c332136a10b1c560d4c68be5b8bab97552 Reviewed-on: https://code.wireshark.org/review/9780 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-181.99.7 → 1.99.8Gerald Combs1-1/+1
Change-Id: I3423fd2959b1031480f15504ce38336ce3475b17 Reviewed-on: https://code.wireshark.org/review/8979 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-281.99.6 → 1.99.7.Gerald Combs1-1/+1
Change-Id: I8c431f162d199c8507ba57d84e496dce5f5a0933 Reviewed-on: https://code.wireshark.org/review/8677 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-201.99.5 → 1.99.6.Gerald Combs1-1/+1
Change-Id: Iff642606bdb9858dc54b90abe02bf1572f44fc25 Reviewed-on: https://code.wireshark.org/review/7766 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-191.99.4 → 1.99.5.Gerald Combs1-1/+1
Change-Id: Ifa1a57ac2db5d921d9b53dbe997cfa1916720c26 Reviewed-on: https://code.wireshark.org/review/7759 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-051.99.3 → 1.99.4.Gerald Combs1-1/+1
Change-Id: I96953b6ca34140972a783c3066614399981ca1e2 Reviewed-on: https://code.wireshark.org/review/7549 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-041.99.2 → 1.99.3.Gerald Combs1-1/+1
Change-Id: Id03d0243f20b33873a92be7444b61952d0b18638 Reviewed-on: https://code.wireshark.org/review/6956 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-231.11.4 → 1.99.0.Gerald Combs1-1/+1
Change-Id: I5b0f713fdbc63e78f4f52177317c0e536aca3044 Reviewed-on: https://code.wireshark.org/review/1761 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-25Support out-of-source checkapiStig Bjørlykke1-2/+4
Always call $(top_srcdir)/tools/checkAPIs.pl with -sourcedir=$(srcdir) from Makefile.am to allow out-of-source 'make checkapi'. Change-Id: I60d7e0079984a8ededdacf4517a0738486fa7973 Reviewed-on: https://code.wireshark.org/review/1294 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-151.11.3 → 1.11.4.Gerald Combs1-1/+1
Change-Id: I0bf8792b9b524ae4d8e1022b234e2510972c7019 Reviewed-on: https://code.wireshark.org/review/1154 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-16Remove Visual Studio solution and project files (and their existence from ↵Michael Mann1-1/+0
Makefiles) There have been discussions on -dev about removing this and I believe I was the last holdout. Finally convinced that I should just have a local copy (ignored by git) Change-Id: Ic72a22baf58e3412023cf851f0fce16eb07113b0 Reviewed-on: https://code.wireshark.org/review/681 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-11-181.11.2 → 1.11.3.Gerald Combs1-1/+1
svn path=/trunk/; revision=53412
2013-11-151.11.1 → 1.11.2.Gerald Combs1-1/+1
svn path=/trunk/; revision=53346
2013-07-12Avoid building ascend.h and ascend.c in parallel (2 bison's running at the ↵Jeff Morriss1-1/+3
same time sometimes results in corrupted output). svn path=/trunk/; revision=50524
2013-04-221.9.3 → 1.11.0.Gerald Combs1-1/+1
svn path=/trunk/; revision=48972
2013-03-281.9.2 → 1.9.3.Gerald Combs1-1/+1
svn path=/trunk/; revision=48627
2013-03-181.9.1 → 1.9.2.Gerald Combs1-1/+1
svn path=/trunk/; revision=48406
2013-03-12From David Arnold:Jaap Keuter1-1/+1
Replace use of INCLUDES with AM_CPPFLAGS in all Makefiles to placate recent autotools. svn path=/trunk/; revision=48261
2013-03-01Export libwireshark symbols using WS_DLL_PUBLIC defineBalint Reczey1-1/+1
Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992
2013-02-28Export libwiretap symbols using WS_DLL_PUBLIC defineBalint Reczey1-6/+6
TODO: hide flex-generated functions svn path=/trunk/; revision=47948
2013-02-25Add dumpabi targets to CMake buildsBalint Reczey1-1/+1
Also update automake generated targets to match CMake generated ones svn path=/trunk/; revision=47879
2013-01-29Use readlink instead of ls.Gerald Combs1-1/+1
svn path=/trunk/; revision=47338
2013-01-28make dumpabi target build with multiple digits in library version numbersBalint Reczey1-1/+1
svn path=/trunk/; revision=47329
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-19ascend_scanner.c includes ascend.h. Add corresponding makefileGerald Combs1-1/+3
dependencies, otherwise we might have a race condition when doing parallel makes. Hopefully this will fix intermitten buildbot failures we've been getting lately. svn path=/trunk/; revision=43387
2012-06-08Forward-port r43165 and r43168 from trunk-1.6.Gerald Combs1-5/+7
------------------------------------------------------------------------ r43165 | gerald | 2012-06-08 14:23:25 -0700 (Fri, 08 Jun 2012) | 4 lines Changed paths: M /trunk-1.6/epan/Makefile.am M /trunk-1.6/wiretap/Makefile.am M /trunk-1.6/wsutil/Makefile.am Use separate commands in the dumpabi recipes instead a big huge long chain. If abi-compliance-checker fails print the contents of its log file. ------------------------------------------------------------------------ r43168 | gerald | 2012-06-08 15:43:50 -0700 (Fri, 08 Jun 2012) | 2 lines Changed paths: M /trunk-1.6/epan/Makefile.am M /trunk-1.6/wiretap/Makefile.am M /trunk-1.6/wsutil/Makefile.am Make sure ln happens in the right directory. ------------------------------------------------------------------------ We don't currently have a usable tag for "git describe --tags --abbrev=0" to latch onto so just use the first 1.9 commit. svn path=/trunk/; revision=43170
2012-06-04There doesn't appear to be a way to convey the message "This library isGerald Combs1-1/+1
under development. Maybe you should use a stable version." via the version number. Use the next best thing and set each number to zero. svn path=/trunk/; revision=43073
2012-04-061.7.1 → 1.7.2.Gerald Combs1-1/+1
svn path=/trunk/; revision=41971
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
2011-06-07Add more missing files.Anders Broman1-0/+1
svn path=/trunk/; revision=37593
2011-06-06Add links to libtool's recommendations for library versions.Gerald Combs1-0/+1
svn path=/trunk/; revision=37582
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 23:01:00 +0000