diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-17 06:13:39 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-17 06:13:39 +0000 |
| commit | 4148aac56ceb80d7dd05d11c05b82e9a5eff889d (patch) | |
| tree | d10a178967e7ea3c4e2fc03b45ad1b20471479cc | |
| parent | 42d22cf0a3e6630a90e15f9f615d8d58c342a4af (diff) | |
Automake 1.4b (which is actually a test version of 1.5, i.e. of a
*future* version, not of 1.4, which is the *current* version - i.e.,
it's newer than 1.4) complains, if "dfilter-grammar.c" and
"dfilter-scanner.c" are part of "EXTRA_libethereal_a_SOURCES", that
"dfilter-grammar.o" is built both from "dfilter-grammar.c" and
"dfilter-grammar.y", and that "dfilter-scanner.o" is built both from
"dfilter-scanner.c" and "dfilter-scanner.l", and refuses to build
"Makefile.in".
Moving them to "EXTRA_DIST" makes 1.4b happy.
Automake 1.4 allows them either to be in "EXTRA_libethereal_a_SOURCES"
or in "EXTRA_DIST"; the only difference between the generated
"Makefile.in" files is which of those two variables the files are in,
and the only difference that makes is that it keeps those two files out
of "SOURCES", which means that "make ID" doesn't include them in the
files it looks at, and "make TAGS" and "make tags" don't include them in
the files they look at. I'm not sure whether the tags file should be
built from "dfilter-grammar.y" and "dfilter-scanner.l", or from
"dfilter-grammar.c" and "dfilter-scanner.c"; the former means you see
the real source file, not the generated source file, if you look for a
symbol defined in one of those files, while the latter means you can
look for symbols in code generated by YACC/Bison or Flex.
In either case, the generated files go into the distribution tarball,
which is what we want.
For now, we go with what makes Automake 1.4b happy.
svn path=/trunk/; revision=2909
| -rw-r--r-- | epan/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am index c97626b103..b7b716ac91 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -2,7 +2,7 @@ # Automake file for the EPAN library # (Ethereal Protocol ANalyzer Library) # -# $Id: Makefile.am,v 1.14 2000/11/20 16:18:08 gram Exp $ +# $Id: Makefile.am,v 1.15 2001/01/17 06:13:39 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@zing.org> @@ -70,9 +70,6 @@ libethereal_a_SOURCES = \ tvbuff.h EXTRA_libethereal_a_SOURCES = \ - dfilter-grammar.c \ - dfilter-grammar.h \ - dfilter-scanner.c \ inet_aton.c \ inet_pton.c \ inet_ntop.c \ @@ -81,6 +78,9 @@ EXTRA_libethereal_a_SOURCES = \ EXTRA_DIST = \ config.h.win32 \ + dfilter-grammar.c \ + dfilter-grammar.h \ + dfilter-scanner.c \ Makefile.nmake \ tvbtest.c |