Tue Oct 21 00:39:44 1997 Tom Tromey <tromey@cygnus.com>
+ * automake.in (handle_lib_objects_cond): Don't require @LEXLIB@.
+ (handle_programs): Likewise.
+
* subdirs.am (check-recursive installcheck-recursive
info-recursive dvi-recursive): Handle case when SUBDIRS is empty.
(maintainer-clean-recursive): Likewise. From Assar Westerlund.
# transformed name of object being built, or empty string if no object
# name of _LDADD/_LIBADD-type variable to examine
# boolean (lex_seen) which is true if a lex source file was seen in this
-# object. valid only for LDADDs, not LIBADDs. If set, LEXLIB
-# must be in LDADD.
+# object. valid only for LDADDs, not LIBADDs.
# Returns 1 if LIBOBJS seen, 0 otherwise.
sub handle_lib_objects
{
local ($lsearch);
local (@dep_list) = ();
- # If no lex source seen, just assume this is ok.
- local ($lex_ok) = $lex_seen ? 0 : 1;
-
local ($seen_libobjs) = 0;
local ($flagvar) = 0;
&require_file_with_line ($var, $FOREIGN, 'alloca.c');
$seen_c_source = $var;
}
- elsif ($lsearch eq '@LEXLIB@')
- {
- # FIXME: variable_value_as_list requires us to force
- # @LEXLIB@ here, where we'd really prefer $(LEXLIB).
- # Nasty -- this will have to wait until many cleanups are
- # made, I think.
- $lex_ok = 1;
- }
- }
-
- if (! $lex_ok)
- {
- &am_line_error ($var, 'lex source file used without @LEXLIB@');
}
if ($xname ne '' && ! &variable_defined ($xname . '_DEPENDENCIES', $cond))
&define_variable ($xname . '_LDFLAGS', '');
}
- if ($lex_file_seen)
- {
- &am_line_error ($xname . $xt,
- 'lex source file used without @LEXLIB@');
- }
-
# Determine program to use for link.
local ($xlink);
if (&variable_defined ($xname . '_LINK'))
Tue Oct 21 00:46:24 1997 Tom Tromey <tromey@cygnus.com>
+ * lex2.test: Removed; @LEXLIB@ no longer required.
+
* depacl2.test: Use -I, not --acdir.
* install.test: New file.
implicit.test spell.test spell2.test confsub.test primary.test \
primary2.test depend2.test spell3.test comment2.test vpath.test \
symlink.test discover.test acinclude.test req.test acsilent.test \
-distdir.test lex2.test libobj4.test libobj5.test version.test \
-ranlib.test confvar.test confvar2.test stdlib.test cxxo.test \
-colon2.test colon3.test remake.test output.test output2.test \
-remake2.test output3.test output4.test colneq2.test subst.test \
-defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test \
-cxxlibobj.test seenc.test cygwin32.test lisp.test stamph.test \
-ldadd.test version2.test conf2.test cond.test cond2.test xsource.test \
+distdir.test libobj4.test libobj5.test version.test ranlib.test \
+confvar.test confvar2.test stdlib.test cxxo.test colon2.test \
+colon3.test remake.test output.test output2.test remake2.test \
+output3.test output4.test colneq2.test subst.test defun2.test \
+yaccpp.test texinfo3.test texinfo4.test tagsub.test cxxlibobj.test \
+seenc.test cygwin32.test lisp.test stamph.test ldadd.test \
+version2.test conf2.test cond.test cond2.test xsource.test \
libobj6.test depend3.test output5.test ammissing.test install.test
EXTRA_DIST = defs $(TESTS)
implicit.test spell.test spell2.test confsub.test primary.test \
primary2.test depend2.test spell3.test comment2.test vpath.test \
symlink.test discover.test acinclude.test req.test acsilent.test \
-distdir.test lex2.test libobj4.test libobj5.test version.test \
-ranlib.test confvar.test confvar2.test stdlib.test cxxo.test \
-colon2.test colon3.test remake.test output.test output2.test \
-remake2.test output3.test output4.test colneq2.test subst.test \
-defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test \
-cxxlibobj.test seenc.test cygwin32.test lisp.test stamph.test \
-ldadd.test version2.test conf2.test cond.test cond2.test xsource.test \
+distdir.test libobj4.test libobj5.test version.test ranlib.test \
+confvar.test confvar2.test stdlib.test cxxo.test colon2.test \
+colon3.test remake.test output.test output2.test remake2.test \
+output3.test output4.test colneq2.test subst.test defun2.test \
+yaccpp.test texinfo3.test texinfo4.test tagsub.test cxxlibobj.test \
+seenc.test cygwin32.test lisp.test stamph.test ldadd.test \
+version2.test conf2.test cond.test cond2.test xsource.test \
libobj6.test depend3.test output5.test ammissing.test install.test
EXTRA_DIST = defs $(TESTS)
+++ /dev/null
-#! /bin/sh
-
-# Test of lex error case.
-
-. $srcdir/defs || exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_LEX
-AC_DECL_YYTEXT
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zot
-zot_SOURCES = joe.l
-END
-
-: > joe.l
-
-$AUTOMAKE && exit 1
-exit 0