Akim Demaille [Wed, 7 Mar 2001 18:39:09 +0000 (18:39 +0000)]
* automake.in (&handle_merge_targets): Ventilate its non `all'
related content into...
(&generate_makefile): here.
(&handle_merge_targets): Rename as...
(&handle_all): this.
Remove a useless `if': `@all' is obviously not empty, since it
contains at least the `basename ($makefile)' which has just been
unshifted.
Pavel Roskin [Tue, 6 Mar 2001 00:48:20 +0000 (00:48 +0000)]
* tests/copy.test: Never use `rm' without `-f' - it may ask
questions, notably for read-only files during `make distcheck'.
* tests/insh.test: Likewise.
* tests/installsh.test: Likewise.
* tests/symlink.test: Likewise.
* tests/symlink2.test: Likewise.
* tests/symlink3.test: Likewise.
Akim Demaille [Mon, 5 Mar 2001 19:29:15 +0000 (19:29 +0000)]
* automake.in (&handle_options): Change the RE so that the third
part of the versions always exist.
(&file_contents): Don't pass uninitialized values to &transform.
Akim Demaille [Mon, 5 Mar 2001 18:56:44 +0000 (18:56 +0000)]
Always use hashes with &file_contents.
* automake.in (&handle_texinfo): texibuild.am does not need
TEXINFODIR.
texinfos.am wants only TEXICLEANS.
(&handle_dist, &add_depend2, &handle_clean): Replace $xform with
%transform.
* texinfos.am: Adjust.
Akim Demaille [Mon, 5 Mar 2001 15:02:58 +0000 (15:02 +0000)]
If OBJEXT and EXEEXT are not set, provide a default value, and use
them unconditionally.
* automake.in (&generate_makefile): Provide default values for
EXEEXT and OBJEXT.
(&get_object_extension, &finish_languages)
(&handle_single_transform_list, &handle_programs, &add_depend2)
(&check_cygnus, &lang_c_finish, am_install_var): Don't bother with
them, they are defined.
* compile.am, depend2.am, program.am, progs.am: Likewise.
* remake-hdr.am: Fix a typo.
* tests/cxxo.test, tests/fo.test, tests/implicit.test,
* tests/interp.test, tests/subobj.test, tests/subobj2.test,
* tests/suffix2.test: Adjust.
Akim Demaille [Mon, 5 Mar 2001 14:45:36 +0000 (14:45 +0000)]
Make the installation/uninstallation of Info pages follow the
regular am/recursive scheme.
* automake.in (%required_targets, %dependencies): Add
install-info.
(%dependencies): Add install-info, install-info-am, and
unstall-info.
(&handle_subdirs): Don't transform INSTALLINFO, which mapping was
reversed BTW. Does anybody use the option `no-installinfo'?
(&handle_merge_targets): Let the handling of info related targets
to...
(&handle_factored_dependencies): this.
* subdirs.am: Use ?INSTALL-INFO?.
* texinfos.am: Define the install-info, uninstall-info and
uninstall-info-am targets.
Akim Demaille [Mon, 5 Mar 2001 14:38:52 +0000 (14:38 +0000)]
* automake.in (&pretty_print_internal): Don't output useless
spaces.
(define_pretty_variable): Don't issue the space after the `=' sign
to avoid trailing spaces in Makefile.ins.
Akim Demaille [Mon, 5 Mar 2001 14:33:37 +0000 (14:33 +0000)]
* automake.in ($am_relative_dir): Global.
(&initialize_per_input): Init it.
(%make_list, @make_input_list): My them from
(&scan_autoconf_files): here.
(&require_file_internal): Mying changes.
Akim Demaille [Mon, 5 Mar 2001 14:30:28 +0000 (14:30 +0000)]
* automake.in (%am_vars, @var_list, %def_type): Globals.
(&initialize_per_input): Initialize them.
(&read_main_am_file): Don't local them.
(&get_object_extension): $objext is private.
(&handle_single_transform_list): $lang is.
(&handle_ltlibraries): $libname_rx is.
(&scan_autoconf_config_files): How about actually paying attention
to your arguments, instead of working on $_? (this is no Perl
variable, it's a Perl variable followed by a question mark).
(&file_contents): $contents and $separator are private.
(&am_install_var): Declare @condvals, not $condvals.
(%make_dirs): My.
Akim Demaille [Mon, 5 Mar 2001 13:21:33 +0000 (13:21 +0000)]
Let's make it run ten times faster...
* automake.in (&transform): Be sure to remove the `n' with ?FOO?
transformations.
(&file_contents): Let `$command' remove the Automake commands, and
normalize the series of `n'.
Slurp the file and apply $command in a single step.
No longer apply the `@MAINTAINER_MODE_TRUE@' transformation which
is already normalized to be handled by &transform.
Tom Tromey [Mon, 5 Mar 2001 07:49:42 +0000 (07:49 +0000)]
* automake.in (register_language): Add entry for `-pure'.
Added `pure=yes' entries for cxx, objc, f77, ppf77, ratfor, java.
(finish_languages): Use `-pure' field of language map.
Tom Tromey [Sun, 4 Mar 2001 21:05:09 +0000 (21:05 +0000)]
* tests/yaccvpath.test: No need to remove dummy files.
* tests/subobj3.test: No need to remove dummy files.
* tests/pr9.test: No need to remove dummy files.
* tests/pr87.test: No need to remove dummy files.
* tests/pr19.test: No need to remove dummy files.
* tests/install2.test: No need to remove dummy files.
* tests/defs: Actually copy in install-sh, mkinstalldirs, missing,
and depcomp.
Pavel Roskin [Sat, 3 Mar 2001 07:13:04 +0000 (07:13 +0000)]
* tests/yaccvpath.test: Add a delay to make parse.c really out
of date. Detect the problem earlier, after `make distdir'. Drop
dependency on flex. Always use the `-y' flag for bison. Comment
changes.
* tests/Makefile.am: Add yaccvpath.test to XFAIL_TESTS.
Akim Demaille [Wed, 28 Feb 2001 09:53:10 +0000 (09:53 +0000)]
* automake.in (&add_depend2): Transform `GENERIC'.
Get rid of the ad hoc transformation of `@EXT@.o:' which in
addition was broken by the `@ -> %' patch.
* depend2.am: Adjust to use ?GENERIC?.
Akim Demaille [Tue, 27 Feb 2001 09:12:41 +0000 (09:12 +0000)]
Distinguish automake substitutions from config.status
substitutions.
* automake.in (&add_depend2): Transform AMDEP.
(&handle_clean): Transform MCFILES and MFILES.
(&file_contents): Transform MAINTAINER_MODE.
(&transform, &am_install_var): Use `%', not `@'.
Adjust all the *.am files.
* clean.am: Use ?MFILES? instead of ad hoc MAINTAINERCLEAN.
* depend2.am: Display the double dependency on both ?AMDEP? and
@AMDEP@.
Akim Demaille [Mon, 26 Feb 2001 09:30:01 +0000 (09:30 +0000)]
* automake.in (&handle_merge_targets, &do_one_merge_target): Don't
work on targets handled by %dependencies.
(&handle_factored_dependencies): Do it.
* install.am: Install install-exec, install-data and uninstall's
suites.
Akim Demaille [Sun, 25 Feb 2001 18:42:41 +0000 (18:42 +0000)]
Internally just store the conditionals as space separated lists of
CONDITIONS (instead of @CONDITIONS@).
* automake.in (&conditional_true_when, &variable_conditions_sub):
Split conditions at spaces.
(&handle_dependencies, &variable_conditions_permutations): Don't
put @ around conditions.
(&variable_conditions_cmp): There are no @ to strip.
(&make_condition): New.
(&define_pretty_variable, &read_main_am_file, &read_am_file): Use
it.
(&read_main_am_file, &read_am_file): Stop playing with @ by hand.
Join @conditional_stack with spaces.
(&read_main_am_file): Adjust the output of variables.
Output `TRUE = true' under the condition `TEST' as `@TEST@TRUE =
true' and no longer `@TEST@TRUE = @TEST@true'.
(&variable_conditions_cmp): Rename as...
(&by_condition): this.
Sort in a human pleasant order.
Use it everywhere a human can see conditions.
(&variable_conditions_reduce): Don't sort conditions, that's
pointless.
* tests/cond.test, ctarget1.test, pluseq3.test: Strengthen.
Akim Demaille [Sun, 25 Feb 2001 18:37:40 +0000 (18:37 +0000)]
* automake.in (&initialize_per_input): %targets_conditionals is
new.
(&read_am_file): When slurping a rule, set the target related
variable, and no variable related variable.
(&file_contents): Likewise.
* tests/vartar.test, tests/ctarget1.test: New.
Akim Demaille [Sun, 25 Feb 2001 18:17:57 +0000 (18:17 +0000)]
* automake.in (&initialize_per_input): %targets_conditionals is
new.
(&read_am_file): When slurping a rule, set the target related
variable, and no variable related variable.
(&file_contents): Likewise.
* tests/vartar.test, tests/ctarget1.test: New.
Akim Demaille [Sun, 25 Feb 2001 18:16:07 +0000 (18:16 +0000)]
* automake.in (&variable_defined, &variable_value_as_list_worker):
If $VAR is effectively a variable, don't die if it's also a
target.
Plus some formatting changes.
git://sourceware.org / automake.git / log