Tom Tromey [Sat, 30 Mar 2002 00:26:05 +0000 (00:26 +0000)]
For PR automake/312:
* lib/am/libtool.am (clean-libtool): Use LTRMS.
* automake.in (handle_single_transform_list): When processing a
libtool object, clean the ordinary object and register the
directory.
(libtool_clean_directories): New global.
(initialize_per_input): Initialize it.
(generate_makefile): Call handle_libtool later.
(handle_libtool): Handle libtool_clean_directories.
* tests/subobj9.test: New file.
* tests/Makefile.am (TESTS): Added subobj9.test.
* tests/extra7.test: New file.
* tests/Makefile.am: Add it.
* lib/am/distdir.an (distdir): When a distribuable directory
exists both in `.' and $(srcdir), merge both directories. This
works around a failure of extra6.test on Tru64 reported by
Nicolas Joly.
* Makefile.am (maintainer-check): Catch occurrences of
`$MAKE foo=bar' in the testsuite. Suggest using
`foo=bar $MAKE -e' instead.
* tests/ansi3.test, tests/ansi5.test, tests/subobj3.test:
Use $MAKE -e. This fixes a ansi5.test failure with Solaris make.
* tests/defs: Unset $srcdir, and set $testsrcdir to its old value.
* tests/installsh.test (AUTOMAKE, ACLOCAL): Use $testsrcdir.
* Makefile.am (maintainer-check): Check for misuses of make,
autoconf, automake, aclocal, and perl in the testsuite. Suggest
using $MAKE, $AUTOCONF, $AUTOMAKE, $ACLOCAL, and $PERL instead.
* tests/confsub.test: Use $AUTOCONF and $MAKE.
* tests/extra5.test, tests/extra6.test, tests/lex5.test,
tests/nobase.test, tests/nodist2.test, tests/pr204.test,
tests/pr224.test, tests/pr287.test, tests/strip.test,
tests/yacc8.test: Use $MAKE.
* tests/version5.test: New file.
* tests/Makefile.am (TESTS): Add it.
* automake.in (version_split, version_compare): New functions.
(version_check): Rewrite using version_split and version_compare.
(process_option_list): Adjust regex.
Richard Boulton [Mon, 11 Mar 2002 17:24:12 +0000 (17:24 +0000)]
automake.in (check_typos): Allow variables with reserved
suffices (such as _LDFLAGS) and prefixes which aren't
recognised if the variable is defined in configure.ac.
Fixes acsubst.test.
Richard Boulton [Mon, 11 Mar 2002 17:00:43 +0000 (17:00 +0000)]
tests/acsubst.test: New test, by Alexandre Duret-Lutz
tests/acsubst2.test: New test, by Alexandre Duret-Lutz
tests/Makefile.am (TEST): Added acsubst.test and acsubst2.test
Fix for PR automake/303:
* automake.in (version_check): Move the error message ...
(process_option_list): ... here, so we can distinguish between
global and local options.
* tests/pr300-lib.test, tests/pr300-ltlib.test,
tests/pr300-prog.test: Use AC_OUTPUT, not AC_OUTPUT(Makefile), so
Autoconf doesn't complain about Makefile being output twice.
Fix for PR automake/300:
* tests/pr300-lib.test, tests/pr300-ltlib.test,
tests/pr300-prog.test: New files.
* tests/Makefile.am (TESTS): Add them.
* automake.in (handle_ltlibraries): Strip nobase_ prefix to
compute the directory.
* lib/am/header-vars.am (install_sh_PROGRAM): New variable.
* lib/am/libs.am (%DIR%LIBRARIES_INSTALL): New variable.
(install-%DIR%LIBRARIES): Use it. Honor nobase_.
(uninstall-%DIR%LIBRARIES): Honor nobase_.
* lib/am/ltlibs.am (%DIR%LTLIBRARIES_INSTALL): New variable.
(install-%DIR%LTLIBRARIES): Use it. Honor nobase_.
(uninstall-%DIR%LTLIBRARIES): Honor nobase_.
* lib/am/progs.am (%DIR%PROGRAMS_INSTALL): New variable.
(install-%DIR%PROGRAMS): Use it. Honor nobase_.
(uninstall-%DIR%PROGRAMS): Honor nobase_.
See also the fix for nobase.test on 2001-11-09.
Fix for PR automake/294:
* tests/dirforbid.test: New file.
* tests/Makefile.am (TESTS): Add it.
* automake.in (standard_prefix): New hash.
(am_primary_prefixes): Forbid standard_prefixes which are not
explicitely allowed.
* automake.texi (Uniform): Remove FIXME.
For PR automake/297:
* lex.m4 (AM_PROG_LEX): Don't set LEX=${am_missing_run}flex until
after AC_PROG_LEX, since it will try to run it and fail (in autoconf
2.52 at least).
* automake.in (scan_one_autoconf_file): Declare
LEX_OUTPUT_ROOT and LEXLIB as configure variables when
AM_PROG_LEX or AC_PROG_LEX are seen. This allows to ...
* lib/am/lex.am: ... remove the LEX_OUTPUT_ROOT and LEXLIB
definitions. Search %SOURCE% in $(srcdir). Use s||| instead
of s/// in the sed invocation, to support filenames containing
slashes.
* lib/am/yacc.am: Search %SOURCE% in $(srcdir). Use s||| too.
* tests/lex5.test, tests/yacc8.test: New files.
* tests/Makefile.am (TESTS): Add them.
Tim Van Holder [Wed, 20 Feb 2002 18:10:17 +0000 (18:10 +0000)]
* m4/lispdir.m4: Redirect /dev/null to stdin when running $EMACS
to try and prevent a non-lisp emacs from starting in interactive
mode.
* automake.texi: Document this change.
* automake.in (handle_lib_objects_cond): Tell the user to put
global linker flags in AM_LDFLAGS, not LDFLAGS.
* automake.texi (General Operation): AC_SUBST'ed variables
override Automake's variables.
(Uniform): More words and @refs.
(Auxiliary Programs) <config.sub, config.guess>: Add URL.
(etags): More explanations about the first example.
(Invoking Automake): Mention autoreconf. More @refs.
(Requirements): Mention AC_CONFIG_FILES.
(Optional): AC_CHECK_TOOL will no longer install config.sub and
config.guess. Mention AC_LIBOBJ, AC_LIBSOURCE, and AC_LIBSOURCES.
(Invoking aclocal): aclocal no longer warn about duplicates.
(Macros) <AM_INIT_AUTOMAKE>: More explanations.
(Extending aclocal): Suggest using the output of
`aclocal --print-ac-dir` to install third-party macros.
(Alternative): Specify ordering of dist_, nodist_, and nobase_
prefixes.
(A Program): Mention scripts. The global LDADD variable is not
meant to hold link flags, suggest using AM_LDFLAGS instead.
(Program and Library Variables) <maude_LIBADD, maude_LDADD>:
_LIBADD and _LDADD are subject to the same restriction wrt to
link flags.
(Program and Library Variables) <maude_DEPENDECIES>: Is also
derived from maude_LIBADD.
(Program variables): Define AM_LDFLAGS.
(Dependencies): Passing the no-dependencies option to
AM_INIT_AUTOMAKE is prefered.
(Scripts): Explain why automake is magically cleaned.
Mention noinst_SCRIPTS and check_SCRIPTS.
(Data): Use dist_ in Automake's example.
(Dist): Reference AM_INIT_AUTOMAKE for PACKAGE and VERSION.
Mention AC_CONFIG_FILES instead of AC_OUTPUT.
* Makefile.am (FETCHFILES): Add Automake/XFile.pm.
(fetch): Fetch XFile.pm. Update the files in $(srcdir) instead
of asking the maintainer to do it manually.
* lib/config.guess, lib/config.sub, lib/texinfo.tex,
Automake/XFile.pm: New upstream versions.
Tom Tromey [Fri, 1 Feb 2002 20:40:48 +0000 (20:40 +0000)]
Change per GNU coding standards:
* aclocal.in (parse_arguments): Only mention most recent year in
copyright output.
* automake.in (version): Only mention most recent year.
* automake.in (scan_one_autoconf_file): Don't treat AC_CHECK_TOOL
as AC_CANONICAL_HOST (the former does not require the latter since
Autoconf 2.50).
* m4/strip.m4 (AM_PROG_INSTALL_STRIP): Check for strip.
* automake.texi (Requirements): Do not require STRIP to be
defined by the user.
* lib/am/depend.am (distclean-depend): Erase %DEPDIRS%, not $(DEPDIRS).
* automake.in (handle_languages): Compute and substitute %DEPDIRS%.
* tests/pr224.test: Make sure .deps subdirectories are
erased by distclean.
Tom Tromey [Tue, 22 Jan 2002 00:11:26 +0000 (00:11 +0000)]
* automake.texi (Macros): Updated for new variable names.
(Program and Library Variables): Likewise.
(Assembly Support): Likewise.
* m4/as.m4: Use CCAS and CCASFLAGS.
* automake.in (asm): Use CCAS and CCASFLAGS.
Tom Tromey [Sun, 20 Jan 2002 21:30:17 +0000 (21:30 +0000)]
For PR automake/224:
* tests/Makefile.am (TESTS): Added pr224.test.
* tests/pr224.test: New file.
* lib/depcomp: Fixed computation of depfile.
* lib/am/depend2.am: Use %DEPBASE%, not $(DEPDIR).
* automake.in (handle_single_transform_list): Only reject `..'
component for Java. Put dependencies in directory near object.
(handle_languages): Set DEPBASE. Handle de-ansi-fication.
Tom Tromey [Fri, 18 Jan 2002 22:20:28 +0000 (22:20 +0000)]
For PR automake/288:
* automake.in (lang_c_rewrite): Don't prepend directory to base if
directory is `.'. Also, properly compute de_ansi_files entry in
subdir-objects case
* tests/Makefile.am (TESTS): Added ansi7.test.
* tests/ansi7.test: New file.
Tom Tromey [Wed, 16 Jan 2002 19:05:41 +0000 (19:05 +0000)]
* Makefile.am (install-exec-hook): Use APIVERSION.
* m4/init.m4 (AM_INIT_AUTOMAKE): Use am__api_version.
* m4/amversion.in (AM_AUTOMAKE_VERSION): Set am__api_version from
APIVERSION.
* automake.in (perllibdir): Use APIVERSION.
(libdir): Likewise.
* aclocal.in (perllibdir): Use APIVERSION.
(APIVERSION): New global.
(parse_arguments): Use APIVERSION.
* configure.in (APIVERSION): New subst.
(pkgvdatadir): Use APIVERSION.
Tom Tromey [Mon, 14 Jan 2002 00:29:16 +0000 (00:29 +0000)]
2002-01-13 Tom Tromey <tromey@redhat.com>
For PR automake/288:
* automake.in (lang_c_rewrite): Set value for de_ansi_files entry
to directory.
(lang_c_finish): Likewise. Also, use directory information from
de_ansi_files.
2002-01-13 Kevin Ryde <user42@zip.com.au>
For PR automake/288:
* tests/Makefile.am (TESTS): Added ansi6.test.
* tests/ansi6.test: New file.
Tom Tromey [Sun, 13 Jan 2002 20:33:38 +0000 (20:33 +0000)]
For PR automake/287:
* lib/am/distdir.am (distdir): Use `$$list' trick when looping
over subdirs.
* tests/Makefile.am (TESTS): Added pr287.test.
* tests/pr287.test: New file.
* m4/init.m4 (AM_INIT_AUTOMAKE): Set PACKAGE and VERSION from
AM_INIT_AUTOMAKE arguments when using the old-style call.
Use AC_PACKAGE_TARNAME and AC_PACKAGE_VERSION in the new form only.
Suggested by Pavel Roskin.
* test/nodefine.test, test/nodefine2.test: Check that no-define
works, not the contrary...
* m4/options.m4 (_AM_IF_OPTIONS): Use m4_ifset.
* m4/init.m4 (AM_INIT_AUTOMAKE): A third argument implies no-define,
not the contrary.
* automake.in (file_contents_internal): Introduce two variables,
$is_rule and $discard_rules to track rules spanning across multiple
paragraphs. This fixes a very nasty bug reported by Dmitry Mikhin
where only the first paragraph of such a multi-paragraph rule was
discarded; but it leaves many similar latent bugs (see the FIXMEs).