From 12c706eb277d09a4caf88d7a2ff19e89521d7233 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 21 Oct 1997 18:08:10 +0000 Subject: [PATCH] no longer require @LEXLIB@ --- ChangeLog | 3 +++ automake.in | 25 +------------------------ tests/ChangeLog | 2 ++ tests/Makefile.am | 14 +++++++------- tests/Makefile.in | 14 +++++++------- tests/lex2.test | 21 --------------------- 6 files changed, 20 insertions(+), 59 deletions(-) delete mode 100755 tests/lex2.test diff --git a/ChangeLog b/ChangeLog index 1dcd4a5f..f32a9185 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ Tue Oct 21 00:39:44 1997 Tom Tromey + * 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. diff --git a/automake.in b/automake.in index 9b6cbb2b..ea5279e0 100755 --- a/automake.in +++ b/automake.in @@ -1293,8 +1293,7 @@ sub handle_built_sources # 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 { @@ -1338,9 +1337,6 @@ sub handle_lib_objects_cond 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; @@ -1412,19 +1408,6 @@ sub handle_lib_objects_cond &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)) @@ -1538,12 +1521,6 @@ sub handle_programs &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')) diff --git a/tests/ChangeLog b/tests/ChangeLog index 18ec67c7..909c7270 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,7 @@ Tue Oct 21 00:46:24 1997 Tom Tromey + * lex2.test: Removed; @LEXLIB@ no longer required. + * depacl2.test: Use -I, not --acdir. * install.test: New file. diff --git a/tests/Makefile.am b/tests/Makefile.am index 99ecea6a..269bc628 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -19,13 +19,13 @@ block.test libobj3.test dup2.test gnits.test interp2.test colneq.test \ 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) diff --git a/tests/Makefile.in b/tests/Makefile.in index 43ea527d..b8ecb881 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -80,13 +80,13 @@ block.test libobj3.test dup2.test gnits.test interp2.test colneq.test \ 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) diff --git a/tests/lex2.test b/tests/lex2.test deleted file mode 100755 index ed8ee81a..00000000 --- a/tests/lex2.test +++ /dev/null @@ -1,21 +0,0 @@ -#! /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 -- 2.43.5