aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mate/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2016-06-30Remove Makefile.common filesJoão Valverde1-4/+41
Now that nmake build system has been removed they are not needed anymore. Change-Id: I88075f955bb4349185859c1af4be22e53de5850f Reviewed-on: https://code.wireshark.org/review/16050 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-06-15Remove Nmake build systemPascal Quantin1-2/+0
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-04-28Add a rule to build lemon so any target that depends on it can (re)build it ↵Jeff Morriss1-1/+1
if necessary. See, for example: https://ask.wireshark.org/questions/52045/make-c-plugins-fails-looking-for-target-toolslemonlemonc Also add another lemon dependency for MATE. Change-Id: Ifc62e174fb6dc4247887607ad37a505b36d83134 Reviewed-on: https://code.wireshark.org/review/15143 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-04-03Make the Flex scanners and YACC parser in libraries reentrant.Guy Harris1-1/+2
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-03Revert "autotools: Use -Werror with clean plugin code"João Valverde1-20/+13
This reverts commit 31654e5e5c0c44609584140a10eb7d9aa1572673. Change-Id: I27f3465c680daa599b96a7259ca93f96f2a622a5 Reviewed-on: https://code.wireshark.org/review/14324 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-03autotools: Use -Werror with clean plugin codeJoão Valverde1-13/+20
Change-Id: I0bc94702eaf87924467e6129ac22f4755308f8d3 Reviewed-on: https://code.wireshark.org/review/14319 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-20autotools: Move common automake code for plugins to an include fileJoão Valverde1-64/+2
Change-Id: Icac1eb17ff78ae5ae54b61820618bf3c5733bd96 Reviewed-on: https://code.wireshark.org/review/14003 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-29Try to fix 'make distcheck'João Valverde1-2/+3
Change-Id: I1656ca8e86e506f39ef7f7600bd9d5a21670ad1e Reviewed-on: https://code.wireshark.org/review/13589 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-28MATE: Disable Werror as before g265a41eJoão Valverde1-2/+1
Change-Id: Ia89f40245e5b7eab2dc23ce7b37d5107863bbfdd Reviewed-on: https://code.wireshark.org/review/13583 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-28autotools: Don't use "user variables" to set build flagsJoão Valverde1-10/+5
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-07-02Lemon: Update lemon toolsAlexis La Goutte1-1/+1
Update from SQLite trunk (19 April 2015) Add include <config.h> Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_) Fix implicit conversion loses integer precision Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare] Fix function declaration isn’t a prototype [-Wstrict-prototypes] Fix warning: old-style function definition [-Wold-style-definition] Fix trailing whitespace Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake Fix -Wmissing-prototypes Remove unused function (acttab_free) Add basename the filename with only filename (no path...) Fix lemon.c:3435: warning: implicit conversion shortens 64-bit value into a 32-bit value Add "new" version of lempar.c (3 November 2009). LEMPAR: fix trailing whitespace LEMPAR: fix -Wunused-parameter Change-Id: I2df7e39c9a6846de26743a981fb76aca423fe813 Reviewed-on: https://code.wireshark.org/review/6502 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-11Revert "Lemon: Update lemon tools"Pascal Quantin1-1/+1
This reverts commit 5855dd8d538eb81d4825961b1bf0d583bf96f751. This Lemon update fails to compile on OSX and triggers asserts on other platforms Change-Id: I12a8a2bf32db31e5a9b0cb1a67a39724e30f3e91 Reviewed-on: https://code.wireshark.org/review/6496 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-11Lemon: Update lemon toolsAlexis La Goutte1-1/+1
Fix warning: declaration shadows a variable in the global scope [-Wshadow] Add include <config.h> Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_) Fix implicit conversion loses integer precision Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare] Fix function declaration isn’t a prototype [-Wstrict-prototypes] Fix warning: old-style function definition [-Wold-style-definition] Fix trailing whitespace Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake Fix -Wmissing-prototypes Remove unused function (acttab_free) Add basename the filename with only filename (no path...) Change-Id: Ia79f61e29f828575df61cc89134c6c553044e86d Reviewed-on: https://code.wireshark.org/review/3976 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-31Don't show the echo/python command lines when making plugin.cРоман Донченко1-3/+4
For consistency with epan/dissectors/Makefile.am. Also, remove the "with python" parts, since that's the only option now. Change-Id: I761e1bf7995c1cc1ebd790013181fd6116b289a1 Reviewed-on: https://code.wireshark.org/review/3925 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-24Remove obsolete comments regarding the shell version of make-dissector-regРоман Донченко1-5/+0
Change-Id: I93470e8c6e9afd6c1ebf735eb13141586964be0e Reviewed-on: https://code.wireshark.org/review/3818 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-12Remove make-dissector-reg and require python for autotool builds as wellJoerg Mayer1-12/+4
Change-Id: I6239063a08ba37199a4e95302a3650a80544c750 Reviewed-on: https://code.wireshark.org/review/3562 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-31Add more files to the release tarball.Guy Harris1-1/+14
Change-Id: I02ce275154979ff56f8f8929e5909f3035f62c47 Reviewed-on: https://code.wireshark.org/review/3286 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-06make-dissectors-reg: optimize by factoring out the loopsРоман Донченко1-5/+5
Instead of calling the grep/sed pipelines for each file, build the list of files in the beginning and call each pipeline only once, passing the list to the first grep. This results in a massive speedup in Cygwin; in my test, the time it takes to run make-dissector-reg . dissectors packet-*.c in dissectors/epan is reduced from ~116 to ~3 seconds. I also tried it on NetBSD, where the time do to the same goes from ~6 to ~0.5 seconds. Amend makefile comments to elide mentions of invoking multiple processes per file. Change-Id: Iad441e7d2b6cc3669dada57646e2f8f6b987fd34 Reviewed-on: https://code.wireshark.org/review/2826 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25Support out-of-source checkapiStig Bjørlykke1-1/+2
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-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>
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-02-15Get rid of an extra blank line.Guy Harris1-1/+0
svn path=/trunk/; revision=47677
2013-02-12Fix the grammar.h/grammar.c/grammar.lemon dependency so thatGilbert Ramirez1-2/+2
grammar.h is not always out of date. Use the same pattern as in the Makefile.nmake files svn path=/trunk/; revision=47643
2013-02-08We don't care what source files are "dissector" source files, we onlyGuy Harris1-5/+4
need to care whether source files should be scanned for registration functions. Reduce the number of macros we define in Makefile.common.inc, getting rid of some only used internally. svn path=/trunk/; revision=47556
2013-02-06-Werror needs to be applied only to clean files, not to, for example,Guy Harris1-3/+6
Flex-generated files. Comment it out for now. svn path=/trunk/; revision=47516
2013-02-06Add -Werror if enabled.Guy Harris1-1/+5
Sort EXTRA_DIST. svn path=/trunk/; revision=47515
2013-02-06Don't run Lemon-generated header files through checkAPI, either (theyGuy Harris1-1/+1
don't have an RCS ID, and they just define a pile of tokens). svn path=/trunk/; revision=47511
2013-02-06Do a bit more splitting and combining of file names, so that we canGuy Harris1-5/+5
avoid running the checkAPI stuff on Flex-generated files. svn path=/trunk/; revision=47506
2013-02-05Put NODIST_ at the beginning of macros containing NODIST, parallelingGuy Harris1-17/+17
the nodist_ convention for Automake variables. Regularize the lists of source files, dividing them according to several attributes. Build composite lists in a plugins/Makefile.common.inc file, to be included by plugin Makefile.common files, and use the composite lists as appropriate in Makefile.am and Makefile.nmake. svn path=/trunk/; revision=47502
2013-02-05Don't distribute the results of running Lemon, as we distribute LemonGuy Harris1-0/+5
ourselves. Clean up various bits of "distribute" vs. "don't distribute" stuff in the process - use similar names, and make the "distribute vs. don't distribute" distinction the same as the "don't clean with "make distclean" vs. clean with "make distclean"" distinction. svn path=/trunk/; revision=47485
2013-02-04More silent build support.Gerald Combs1-5/+0
svn path=/trunk/; revision=47472
2013-02-04Prettify more build output.Gerald Combs1-1/+6
svn path=/trunk/; revision=47469
2013-02-01Enable more build silence.Gerald Combs1-1/+1
svn path=/trunk/; revision=47432
2013-02-01Go far enough down a rabbit hole and you will encounter libtool. SeeGerald Combs1-1/+1
if changing .o to .lo works. svn path=/trunk/; revision=47430
2013-02-01Change some "<x>.c : <y>.h" rules to "<x>.o : <y>.h" in order to fixGerald Combs1-1/+3
distcheck. Add some rules recommended by the Automake manual in order to avoid duplicate actions. svn path=/trunk/; revision=47429
2013-01-30Fix more dependencies.Gerald Combs1-3/+4
svn path=/trunk/; revision=47371
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-01Set Makefile.common as a plugin.c dependency so plugin.c is rebuilt if ↵Bill Meier1-1/+1
Makefile.common is changed svn path=/trunk/; revision=42972
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
2010-05-14Add Cmake stuff to the source distribution so more people can try it out.Jeff Morriss1-7/+8
svn path=/trunk/; revision=32807
2009-09-13Run checkapi on the dissector header filesJeff Morriss1-1/+1
svn path=/trunk/; revision=29883
2008-07-29Allow checkapis target to work in out-of-tree builds (s#../../#$(top_srcdir)).Jeff Morriss1-3/+3
Also use $(top_builddir) instead of ../../ in a couple of other spots. svn path=/trunk/; revision=25863
2008-07-02Add Makefile.common files for epan/dfilter and epan/ftypes.Guy Harris1-0/+3
Add checkapi rules to Makefile.am files. svn path=/trunk/; revision=25656
2008-02-27Quote argument to test in plugins Makefiles, as proposed by Greg A. Woods.Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=24488
2007-08-04Add a script as a front-end for Flex, to work around various problems,Guy Harris1-0/+5
such as the fact that Flex strips all but the last component of the "-o" argument, and that it doesn't generate a header file to declare routines the generated lexical analyzer defines. Use that script when building lexical analyzers, and, for each lexical analyzer, include the generated header file in the generated analyzer. svn path=/trunk/; revision=22446
2007-08-01Add a Makefile.am.inc file, to hold rules etc. used by multipleGuy Harris1-7/+2
Makefile.am files; currently, it has the (F)lex-to-C rule. Have Makefile.am files with .l.c rules include Makefile.am.inc to get that rule. svn path=/trunk/; revision=22436
2007-07-30Add comments to various %option items to explain what they're doing. Guy Harris1-2/+6
Move the %options to the beginning if they weren't already there, and put them in the same order in all files. Add "prefix=" options to .l files that don't already have them, so we don't have to pass a "-P" option. Add "never-interactive" and "noyywrap" options to our lexical analyzers, to remove extra isatty() checks and to eliminate the need for yywrap() from the Flex library. Get rid of %option nostdinit - that's the default. Add .l.c: rules to Makefile.am files, replacing the rules for specific .l files. Have those rules all check that $(LEX) is set. Update the address for the FSF. svn path=/trunk/; revision=22424
2007-05-27Get rid of trailing blank lines.Guy Harris1-1/+0
svn path=/trunk/; revision=21961
2007-05-22"make maintainer-clean" cleans up everything that "make distclean" does;Guy Harris1-3/+0
there's no need for files in DISTCLEANFILES to be in MAINTAINERCLEANFILES as well. In epan, split the generated source files into those that should be cleaned by "make distclean" and those that shouldn't, and have DISTCLEANFILES include only the ones that should be cleaned by "make distclean" and have MAINTAINERCLEANFILES include the ones that shouldn't be cleaned by "make distclean". This should fix bug 1595. The generated source files don't need to be in EXTRA_DIST. Use LIBWIRESHARK_DISTCLEAN_GENERATED_SRC and LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC in epan/Makefile.nmake. svn path=/trunk/; revision=21882