Commit graph

50 commits

Author SHA1 Message Date
Jaap Keuter
827eb58b04 From David Arnold:
Replace use of INCLUDES with AM_CPPFLAGS in all Makefiles to placate recent autotools.

svn path=/trunk/; revision=48261
2013-03-12 06:53:39 +00:00
Gilbert Ramirez
486c6d5445 Fix the grammar.h/grammar.c/grammar.lemon dependency so that
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-12 17:25:28 +00:00
Guy Harris
a13d58a509 Put NODIST_ at the beginning of macro names, as was done for the plugins
directory.

svn path=/trunk/; revision=47599
2013-02-09 23:35:30 +00:00
Guy Harris
9eba2ea90a Don't distribute the results of running Lemon, as we distribute Lemon
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-05 06:09:17 +00:00
Gerald Combs
72db5eed02 Unwrap lines inadvertenly wrapped in r47472
svn path=/trunk/; revision=47473
2013-02-04 18:27:05 +00:00
Gerald Combs
5130da6935 More silent build support.
svn path=/trunk/; revision=47472
2013-02-04 17:49:54 +00:00
Gerald Combs
c0ca6220ef Prettify more build output.
svn path=/trunk/; revision=47469
2013-02-04 17:22:32 +00:00
Gerald Combs
8984a38512 Enable more build silence.
svn path=/trunk/; revision=47432
2013-02-01 22:13:43 +00:00
Gerald Combs
c97b7912fa Go far enough down a rabbit hole and you will encounter libtool. See
if changing .o to .lo works.

svn path=/trunk/; revision=47430
2013-02-01 20:16:31 +00:00
Gerald Combs
34df2dbe54 Change some "<x>.c : <y>.h" rules to "<x>.o : <y>.h" in order to fix
distcheck. Add some rules recommended by the Automake manual in order
to avoid duplicate actions.

svn path=/trunk/; revision=47429
2013-02-01 18:20:17 +00:00
Jeff Morriss
8f0d5f99c6 As suggested by Xavier Raynaud in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6425 :
scanner.c includes (depends on) grammar.h so mark it so in the Makefiles.

svn path=/trunk/; revision=45020
2012-09-20 03:04:48 +00:00
Jeff Morriss
75c3c92f19 Add a "-build" argument to checkAPIs.pl. Use that argument when building
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-04-04 20:46:49 +00:00
Michael Tüxen
c63ad2db03 Sync checkapi target with Makefile.nmake.
svn path=/trunk/; revision=40629
2012-01-21 12:22:01 +00:00
Jeff Morriss
c755b2fd54 Oh yeah, there's a reason we don't put targets in Makefile.common: the first target in a makefile is what you get when you just run make (without a target). Revert 35073 and 35069.
svn path=/trunk/; revision=35075
2010-11-30 02:04:55 +00:00
Jeff Morriss
f1c066bbee Move some checkapi targets into Makefile.common
svn path=/trunk/; revision=35073
2010-11-29 22:34:04 +00:00
Guy Harris
a04774395f Add Makefile.common files for epan/dfilter and epan/ftypes.
Add checkapi rules to Makefile.am files.

svn path=/trunk/; revision=25656
2008-07-02 01:44:30 +00:00
Jaap Keuter
098d297303 Running glib 2.16 on 32 bit platform requires this lempar.c change in addition to revision 24710.
Makefiles updated to make new lempar.c effective in build rules.

svn path=/trunk/; revision=24718
2008-03-23 08:58:52 +00:00
Guy Harris
5be4499ad1 Add a script as a front-end for Flex, to work around various problems,
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-04 02:13:52 +00:00
Guy Harris
159e795100 Add a Makefile.am.inc file, to hold rules etc. used by multiple
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-08-01 20:35:05 +00:00
Guy Harris
968d363f11 Add comments to various %option items to explain what they're doing.
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-07-30 20:22:37 +00:00
Guy Harris
6ea3d47e77 "make maintainer-clean" cleans up everything that "make distclean" does;
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
2007-05-22 07:21:12 +00:00
Sebastien Tandel
def734249e Since code generated by lex may trigger gcc warnings, we are now generating two
libraries.  A single library is generated with the lex code without the barrier
"stop on warning". An other library is generated from the remaining source
files with the "stop on warning" barrier.


svn path=/trunk/; revision=21481
2007-04-20 14:30:48 +00:00
Sebastien Tandel
2878fd21d6 don't treat warnings as errors until a solution is found for scanner.c
depending on the lex used, it may generates warning.

svn path=/trunk/; revision=21424
2007-04-13 23:40:50 +00:00
Stephen Fisher
62f88a4a04 From Sebastien Tandel:
(Temporarily disable the warnings as errors default on Unix to get
to get the buildbots and people with gcc40 going again until those
additional warnings gcc40 generates can be fixed-I'm working on it
ASAP)

   Patch for configure.in which disables by default the treatment of
warnings as errors.
It can be enabled with './configure --with-warnings-as-errors'.
The macro will test first if GCC is present. If it's the case,
HAVE_WARNINGS_AS_ERRORS is defined. All the USING_GCC have been replaced
by HAVE_WARNINGS_AS_ERRORS.
With this switch, people won't suffer from unexpected warnings when
downloading svn sources during the transition time ;)


svn path=/trunk/; revision=21153
2007-03-23 17:49:59 +00:00
Stephen Fisher
13ae3f5dfc Add -Werror for gcc back to epan/dfilter directory
svn path=/trunk/; revision=21136
2007-03-22 23:49:06 +00:00
Stephen Fisher
395bb9b379 Remove -Werror under gcc temporarily until a warning can be fixed
in grammar.c


svn path=/trunk/; revision=21130
2007-03-22 23:28:58 +00:00
Stephen Fisher
84c5becd89 Add -Werror for gcc to a few more directories and fix a few warnings
svn path=/trunk/; revision=21129
2007-03-22 23:24:13 +00:00
Jeff Morriss
9811341b9f dfilter-macro.c is in SVN, it should not be in MAINTAINERCLEANFILES (else we have to re-fetch the file from svn each time we make maintainer-clean
svn path=/trunk/; revision=20641
2007-01-31 03:30:49 +00:00
Luis Ontanon
8e849698a3 Drop dfilter_macro_load.l as dfilter-macro now uses UAT
svn path=/trunk/; revision=20596
2007-01-29 04:57:23 +00:00
Jaap Keuter
820dad2816 Trying to fix the build on Ubuntu-5.10-x86 buildbot again.
svn path=/trunk/; revision=20473
2007-01-18 11:28:47 +00:00
Luis Ontanon
80dcfb23d2 display filter macros.
NOT to be copied over to release 0.99.5


svn path=/trunk/; revision=20467
2007-01-18 02:54:56 +00:00
Guy Harris
9b549043d2 Add $(EXEXT) after references to the Lemon executable.
svn path=/trunk/; revision=19785
2006-11-03 18:39:03 +00:00
Guy Harris
e773247138 If we have to use Lex or Flex, check whether we found it, first, and if
we didn't, report an error and fail, rather than blithely executing
commands with the command a blank string.

svn path=/trunk/; revision=19602
2006-10-19 07:45:10 +00:00
Ronnie Sahlberg
89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Gilbert Ramirez
e3899ed4a4 Add infrastructure for display filter functions.
Add upper() and lower() display filter functions for string fields.

svn path=/trunk/; revision=18071
2006-05-02 14:26:17 +00:00
Gerald Combs
c214405e41 Clean up after ourselves so that we pass "distcheck" again.
svn path=/trunk/; revision=15194
2005-08-02 15:25:41 +00:00
Gerald Combs
6bcaec9a12 Make sure "lemon" exists before we try to use it. This can happen if we
run "make dist" before running "make".

svn path=/trunk/; revision=15167
2005-08-01 21:09:34 +00:00
Jörg Mayer
5b442f2279 After doing "make maintainer-clean", "svn status --no-ignore | grep ^I"
returned quite a list of files. Add them to MAINTAINERCLEANFILES.

Whitespace changes (replace multiple spaces by TABs, in a few cases this
needed to be done at the beginning of Makefile lines.


svn path=/trunk/; revision=14891
2005-07-10 08:04:27 +00:00
Guy Harris
8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Olivier Biot
eee9dc26ac Fix the CLEANFILES target so both static and shared libraries are cleaned.
svn path=/trunk/; revision=10475
2004-03-24 21:27:44 +00:00
Jörg Mayer
b7803c8fc6 Make libethereal and libwiretap shared libs.
svn path=/trunk/; revision=10368
2004-03-13 10:15:36 +00:00
Gilbert Ramirez
d21e83b98b Move version to 0.8.16.
Fix build for splitting build dir from src dir.
Note the use of updated GTK+ release for Win32 binaries.

svn path=/trunk/; revision=3107
2001-03-05 22:53:41 +00:00
Gilbert Ramirez
b864c8d80d Move the location of cppmagic.h, since the lemon-flex include files
require it. It makes more sense to either put cppmagic with lemon, or
in yet another common directory. I'll just put it with lemon.

svn path=/trunk/; revision=3083
2001-02-27 20:34:09 +00:00
Gilbert Ramirez
2a50f8af4f Add Ed Warnicke's drange code to the new dfilter system.
Not supported yet: [i-j] (offset-offset)
Supported:
	[i]	index
	[i:j]	offset:length
	[:j]	0:offset
	[i:]	offset:end
	[x,y]	concatenation of slices

svn path=/trunk/; revision=3080
2001-02-27 19:23:30 +00:00
Guy Harris
c61ee2b4ad Remove the Lemon stuff from EXTRA_DIST; the Lemon source is now in
"tools/lemon", and that directory's "Makefile.am" arranges to put the
Lemon stuff into the distribution.

svn path=/trunk/; revision=3077
2001-02-26 23:56:59 +00:00
Gilbert Ramirez
728ec7f581 Actually, this works better.
svn path=/trunk/; revision=3043
2001-02-16 19:45:38 +00:00
Gilbert Ramirez
9bf1a2e8d0 Use the proper way to denote that a single operation
produces 2 files. (grammar.lemon --> grammar.c grammar.h)

svn path=/trunk/; revision=3042
2001-02-16 19:44:16 +00:00
Gilbert Ramirez
95e09f5ac3 Add Makefile.nmake files for new subdirs.
Add them to EXTRA_DIST in corresponding Makefile.am's so that they
get packaged with the distribution.

svn path=/trunk/; revision=2979
2001-02-02 04:03:43 +00:00
Gilbert Ramirez
96e0398fc6 Grumble, grumble. I forgot to add the license comment at the top
of these files.

svn path=/trunk/; revision=2968
2001-02-01 20:31:21 +00:00
Gilbert Ramirez
8f1fff2e6a Create a more modular type system for the FT_* types. Put them
into epan/ftypes.

Re-write display filter routines using Lemon parser instead of yacc.
Besides using a different tool, the new grammar is much simpler, while
the display filter engine itself is more powerful and more easily extended.

Add dftest executable, to test display filter "bytecode" generation.
Add option to "configure" to build dftest or randpkt, both of which are not
built by default.

Implement Ed Warnicke's ideas about dranges in the new display filter and
ftype code.

Remove type FT_TEXT_ONLY in favor of FT_NONE, and have protocols registered
as FT_PROTOCOL. Thus, FT_NONE is used only for simple labels in the proto tree,
while FT_PROTOCOL is used for protocols. This was necessary for being
able to make byte slices (ranges) out of protocols, like "frame[0:3]"

Win32 Makefile.nmake's will be added tonight.

svn path=/trunk/; revision=2967
2001-02-01 20:21:25 +00:00