Akim Demaille [Tue, 8 May 2001 10:38:12 +0000 (10:38 +0000)]
Note: This patch breaks Automake. Repaired within two patches.
* automake.in (Language): Replace the attribute `output_arg' with
`compile_flag' and `output_flag'.
(Automake): Adjust language registrations.
(&handle_languages): Transform `-c' and `-o' for both suffix and
per object rules, instead of `OUTARG' and `LTOUTARG' only for
generic rules.
(&handle_single_transform_list): Adjust to `compile_flag' and
`output_flag'.
* depend2.am, ext-compile.am: Use `%-c%' and `%-o%'.
Akim Demaille [Tue, 8 May 2001 09:46:12 +0000 (09:46 +0000)]
* automake.in (&handle_languages): Don't transform %COMPILER%.
Use `$lang->compiler' instead of `$pfx' to transform generic
%COMPILE% and %LTCOMPILE%.
* ext-compile.am: Use %COMPILE%, %LTCOMPILE% and %SOURCE% instead
of %COMPILER% and $<.
Akim Demaille [Mon, 7 May 2001 21:41:18 +0000 (21:41 +0000)]
* automake.in (&handle_languages): Use the same `%transform' for
both `depend2.am' and `ext-compile.am'.
Move the definition of `$flag' where it is used, and rename as
`$flags'.
Akim Demaille [Mon, 7 May 2001 17:51:54 +0000 (17:51 +0000)]
* automake.in (&handle_languages): Compute `$ltoutarg' and
`$outarg' independently from dependency code.
There is no use looping on a language's possible extensions since
we loop over used extensions.
Therefore, there is no use for a local `%transform'.
Akim Demaille [Mon, 7 May 2001 17:40:48 +0000 (17:40 +0000)]
* automake.in (&handle_languages): Don't use $comp.
Akim Demaille [Mon, 7 May 2001 17:39:10 +0000 (17:39 +0000)]
* automake.in (&handle_languages): Merge the two loops over
%extension_seen/%languages into one and group code to be run once
per language together.
Akim Demaille [Mon, 7 May 2001 17:22:08 +0000 (17:22 +0000)]
* automake.in (&handle_languages): Move the `if
($use_dependencies)' block so that loops over extensions and
languages are next to each other.
Akim Demaille [Mon, 7 May 2001 17:17:56 +0000 (17:17 +0000)]
* automake.in (&depend2): Remove, merged in...
(&handle_languages): here.
Akim Demaille [Mon, 7 May 2001 17:03:34 +0000 (17:03 +0000)]
* automake.in (&finish_languages): Rename as...
(&handle_languages): this.
Include the body of...
(&handle_dependency): this.
Remove.
Tom Tromey [Mon, 7 May 2001 16:31:01 +0000 (16:31 +0000)]
For PR automake/46:
* tests/Makefile.am (TESTS): Added subdir5.test.
(XFAIL_TESTS): Likewise.
* tests/subdir5.test: New file.
Tom Tromey [Mon, 7 May 2001 16:29:39 +0000 (16:29 +0000)]
* tests/subobj6.test (wish_SOURCES): Use $MAKE.
* tests/subobj5.test (wish_SOURCES): Use $MAKE.
Tom Tromey [Mon, 7 May 2001 16:28:57 +0000 (16:28 +0000)]
* automake.in (GNITS_VERSION_PATTERN): Document. Added `fork
identifier'.
(handle_options): Handle fork identifier in version number.
Tom Tromey [Mon, 7 May 2001 05:41:49 +0000 (05:41 +0000)]
inexplicable omission
Tom Tromey [Mon, 7 May 2001 04:41:51 +0000 (04:41 +0000)]
* automake.texi (Dist): Document distcheck-hook.
Tom Tromey [Sun, 6 May 2001 23:16:05 +0000 (23:16 +0000)]
* tests/confh4.test: Updated to reflect DEFS change.
For PR automake/132.
Tom Tromey [Sun, 6 May 2001 23:01:34 +0000 (23:01 +0000)]
Fix for PR automake/132:
* automake.in (c, c++, objc, asm, ppf77): Add DEFAULT_INCLUDES to
compilation.
(java): Remove INCLUDES and DEFS from compilation.
(lang_c_finish): Add DEFAULT_INCLUDES to compilation.
* compile.am (DEFS): Don't include %DEFAULT_INCLUDES%.
(DEFAULT_INCLUDES): New macro.
Tom Tromey [Sun, 6 May 2001 22:51:47 +0000 (22:51 +0000)]
* automake.in (usage): Re-align explanatory text.
Fixes PR automake/148.
Tom Tromey [Sun, 6 May 2001 22:49:24 +0000 (22:49 +0000)]
* automake.texi (Uniform): Don't use @PROGRAMS@.
Fixes PR automake/154.
Tom Tromey [Sun, 6 May 2001 20:15:43 +0000 (20:15 +0000)]
For PR automake/160:
* tests/Makefile.am (TESTS): Added subobj5.test and subobj6.test.
(XFAIL_TESTS): Added subobj6.test.
* tests/subobj6.test: New file.
Tom Tromey [Sun, 6 May 2001 19:00:23 +0000 (19:00 +0000)]
* distdir.am (distdir): Make subdirectory for each file.
Fixes test subobj5.test.
Tom Tromey [Sun, 6 May 2001 18:03:46 +0000 (18:03 +0000)]
* tests/Makefile.am (TESTS): Added new file.
(XFAIL_TESTS): Likewise.
* tests/texinfo10.test: New file.
Pavel Roskin [Sun, 6 May 2001 06:53:52 +0000 (06:53 +0000)]
Regenerated
Pavel Roskin [Sun, 6 May 2001 06:17:03 +0000 (06:17 +0000)]
* automake.in (scan_texinfo_file): Treat @defindex and @synindex
in the same way as @defcodeindex and @syncodeindex respectively.
Tom Tromey [Sun, 6 May 2001 05:40:47 +0000 (05:40 +0000)]
* mans.am (install-man%SECTION%): Minor cleanup.
(uninstall-man%SECTION%): Likewise.
Tom Tromey [Sun, 6 May 2001 05:39:58 +0000 (05:39 +0000)]
* tests/Makefile.am (XFAIL_TESTS): Removed man.test.
* mans.am (install-man%SECTION%): Handle dist_ and nodist_
prefixes.
(uninstall-man%SECTION%): Likewise.
* automake.in (handle_man_pages): Handle dist_ and nodist_
prefixes.
Tom Tromey [Sun, 6 May 2001 05:26:59 +0000 (05:26 +0000)]
* automake.texi (Future): Removed.
(Depth): Removed.
(Hello): Don't mention `deep'.
(Top level): Likewise.
Tom Tromey [Sun, 6 May 2001 05:25:59 +0000 (05:25 +0000)]
* automake.in (conditional_true_when): Use a hash, not index().
Also, a TRUE component always results in a true return.
Fixes test cond10.test. For PR automake/164.
* tests/Makefile.am (XFAIL_TESTS): Removed cond10.test.
Tom Tromey [Sat, 5 May 2001 22:43:31 +0000 (22:43 +0000)]
2001-05-05 Raja R Harinath <harinath@cs.umn.edu>
For PR automake/164:
* tests/Makefile.am (TESTS): Added new file.
(XFAIL_TESTS): Likewise.
* tests/cond10.test: New file.
Tom Tromey [Sat, 5 May 2001 22:08:48 +0000 (22:08 +0000)]
* texinfos.am (uninstall-info-am): Debian install-info v1.8.3
prints to stderr.
(install-info-am): Likewise.
Tom Tromey [Sat, 5 May 2001 21:16:36 +0000 (21:16 +0000)]
2001-05-05 Pavel Roskin <proski@gnu.org>
* automake.in (scan_texinfo_file): Don't push undefined values
to @clean_suffixes.
Tom Tromey [Sat, 5 May 2001 21:06:46 +0000 (21:06 +0000)]
2001-05-05 Richard Boulton <richard@tartarus.org>
* automake.in (handle_dist): Check for existence of DIST_SUBDIRS
first.
Tom Tromey [Sat, 5 May 2001 20:53:36 +0000 (20:53 +0000)]
2001-05-05 Robert Collins <robert.collins@itdomain.com.au>
* automake.in (required_targets): Added uninstall-am.
Tom Tromey [Sat, 5 May 2001 20:47:29 +0000 (20:47 +0000)]
Fix bug reported by Robert Boehne:
* automake.in (output_lex_build_rule): Don't let AMDEP_TRUE be
substituted.
(handle_dependencies): Likewise.
* Makefile.am (maintainer-check): Look for AMDEP_TRUE
substitution. Correct diff now has 30 lines. Look for space
after losing `undef'.
Akim Demaille [Fri, 4 May 2001 13:43:54 +0000 (13:43 +0000)]
Typo.
Akim Demaille [Fri, 4 May 2001 10:57:35 +0000 (10:57 +0000)]
* m4/sanity.m4: Remove the temp file before possible error exits.
Akim Demaille [Fri, 4 May 2001 09:31:45 +0000 (09:31 +0000)]
* configure.in: Set perllibdir.
From Dave Morrison.
Akim Demaille [Fri, 4 May 2001 08:39:53 +0000 (08:39 +0000)]
* automake.in ($pkgdata_dir): New.
(&require_file_internal): Use it.
Akim Demaille [Thu, 3 May 2001 08:32:37 +0000 (08:32 +0000)]
Add missing files.
Akim Demaille [Thu, 3 May 2001 08:21:05 +0000 (08:21 +0000)]
Case insensitive FS choke on Automake/ vs automake.
Reported by Tim Van Holder.
* Automake/: Move in...
* lib/: this new directory.
Akim Demaille [Thu, 3 May 2001 07:28:20 +0000 (07:28 +0000)]
* data.am (install-%DIR%%PRIMARY%): Execute the same command as
echoed.
Pavel Roskin [Tue, 1 May 2001 04:34:14 +0000 (04:34 +0000)]
* automake.in: Remove `/lib' from include directory.
Akim Demaille [Fri, 27 Apr 2001 14:49:47 +0000 (14:49 +0000)]
AM_INIT_AUTOMAKE is no longer optional.
* automake.in ($seen_make_set, $seen_prog_install)
($seen_arg_prog): Remove.
(&handle_programs, &handle_scripts, &scan_one_autoconf_file):
Remove related code.
Akim Demaille [Fri, 27 Apr 2001 14:03:26 +0000 (14:03 +0000)]
* tests/specflags4.test, tests/specflags5.test: Remove, merged
into...
* tests/specflags3.test: here.
Akim Demaille [Fri, 27 Apr 2001 13:57:39 +0000 (13:57 +0000)]
* automake.in ($seen_path_xtra): Remove.
(&handle_compile): Don't handle `AC_PATH_XTRA' AC_SUBST variables.
(&scan_one_autoconf_file): Do it, instead of setting $seen_path_xtra.
Akim Demaille [Fri, 27 Apr 2001 13:48:22 +0000 (13:48 +0000)]
* automake.in (&file_contents_internal): Declare it.
Akim Demaille [Fri, 27 Apr 2001 13:31:26 +0000 (13:31 +0000)]
* automake.in (&read_am_file, &file_contents_internal): Don't
define macros when `FALSE', to avoid errors on doubly defined
variables but under condition `FALSE'. In order to allow...
(&am_install_var): When reading the associated file for the first
time, enable `%?FIRST%'.
(&handle_libraries): Let libs.am define $(AR) and $(RANLIB).
* libs.am: Do it when `%?FIRST%'.
Akim Demaille [Fri, 27 Apr 2001 13:30:31 +0000 (13:30 +0000)]
* automake.in (handle_compile): Let ansi2knr.am define $(ANSI2KNR).
* ansi2knr.am: Do it.
Prefer `if %?FOO%' to `if %!FOO%'.
Akim Demaille [Fri, 27 Apr 2001 13:28:03 +0000 (13:28 +0000)]
Automake/Makefile.in, Automake/.cvsignore: New.
Akim Demaille [Fri, 27 Apr 2001 13:20:35 +0000 (13:20 +0000)]
* automake.in (®ister_language, &finish_languages): Use `pure'
as a Boolean.
(®ister_language): Use %done properly with objects, not names.
(&finish_languages): Replace `$non_c' with `$needs_c'.
Akim Demaille [Fri, 27 Apr 2001 13:17:02 +0000 (13:17 +0000)]
Unify LISP, PYTHON and JAVA primaries.
* automake.in (&handle_emacs_lisp): Be like &handle_python, i.e.,
return if there are no files, hook elist-comp on the Autoconf
macro, rely on lisp.am to define variables.
(&handle_python, &handle_java): Likewise.
(&scan_one_autoconf_file): Pseudo AC_SUBST of `pythondir' and
`PYTHON' must be handled here, not in `&handle_python'.
* java.am: Define needed variables and rules.
Akim Demaille [Fri, 27 Apr 2001 13:02:16 +0000 (13:02 +0000)]
* automake.in (&am_install_var): Transform `ONE_PRIMARY'.
* data.am: Use it.
* header.am: Include data.am.
Akim Demaille [Fri, 27 Apr 2001 13:00:44 +0000 (13:00 +0000)]
* automake.in (&am_install_var): Transform `PRIMARY'.
* data.am: Equip with %PRIMARY%.
Akim Demaille [Fri, 27 Apr 2001 12:58:04 +0000 (12:58 +0000)]
* automake.in (@conditional_stack): Rename as...
(@cond_stack): this.
(&file_contents_internal): Support inclusion of files.
Akim Demaille [Fri, 27 Apr 2001 12:55:48 +0000 (12:55 +0000)]
* automake.in (&lang_extensions): Remove.
(&add_depend2, &saw_sources_p): Adjust.
* depend2.am: `%EXT%' no longer includes the dot.
Akim Demaille [Fri, 27 Apr 2001 12:48:46 +0000 (12:48 +0000)]
* automake.in (&finish_languages, &handle_single_transform_list)
(&add_depend2, &handle_dependencies): No longer use the language
name in `$lang'. Rename `$lang_obj' as `$lang'.
Akim Demaille [Fri, 27 Apr 2001 11:14:10 +0000 (11:14 +0000)]
* automake.in (®ister_language): Use `new Language' with a hash.
Akim Demaille [Fri, 27 Apr 2001 10:58:01 +0000 (10:58 +0000)]
* automake.in (®ister_language): Rename `output-arg' and
`derived-autodep' as `output_arg' and `derived_autodep' to match
the Language attribute.
Set the defaults in %option instead of $lang.
Akim Demaille [Fri, 27 Apr 2001 10:45:14 +0000 (10:45 +0000)]
* Automake/: New directory.
* Automake/Struct.pm: New file, based on Perl 5.6's Class::Struct.
* automake.in (Language): Use Automake::Struct.
* tests/defs: Adjust to find Struct.
Pavel Roskin [Tue, 24 Apr 2001 18:04:59 +0000 (18:04 +0000)]
Rebuilt.
Pavel Roskin [Tue, 24 Apr 2001 18:00:14 +0000 (18:00 +0000)]
* automake.in: Add forward declaration for register_language().
* tests/Makefile.am (XFAIL_TESTS): Remove installsh.test - it
passes now.
Pavel Roskin [Tue, 24 Apr 2001 17:57:08 +0000 (17:57 +0000)]
* automake.in: Add a forward declaration for register_language().
* tests/Makefile.am (XFAIL_TESTS): Remove installsh.test - it
passes now.
Akim Demaille [Tue, 24 Apr 2001 09:44:16 +0000 (09:44 +0000)]
Regenerate.
Akim Demaille [Mon, 23 Apr 2001 17:10:22 +0000 (17:10 +0000)]
* automake.in (%required_targets): Add `uninstall'.
From Robert Collins.
Akim Demaille [Thu, 12 Apr 2001 16:51:10 +0000 (16:51 +0000)]
XFAIL: installsh.test.
Akim Demaille [Thu, 12 Apr 2001 16:38:04 +0000 (16:38 +0000)]
* automake.in (Language): Add attribute `name'.
(®ister_language): The name of the language is now given in the
hash.
No longer use `$lang' as the name of the language.
Rename `$lang_obj' as `$lang'.
Akim Demaille [Thu, 12 Apr 2001 16:33:52 +0000 (16:33 +0000)]
* automake.in (Language): Add attribute `_finish'.
(&finish): New.
(Automake): Adjust.
(&lang_header_finish, &lang_yaccxx_finish, &lang_lexxx_finish)
(&lang_asm_finish): Remove.
Akim Demaille [Thu, 12 Apr 2001 16:31:54 +0000 (16:31 +0000)]
* automake.in (Language): Add attribute `extensions'.
(Automake): Pass a hash to `®ister_language' instead of a
list of pseudo assignments.
(®ister_language): Adjust.
(&finish_languages): Initialize `$ltoutarg'.
Akim Demaille [Thu, 12 Apr 2001 16:28:05 +0000 (16:28 +0000)]
* automake.in (Language): Add attribute `output_arg'.
(%language_map): Remove.
(®ister_language): Build only the object, and store in
%languages only.
(&finish_languages, &handle_single_transform_list): Adjust.
Akim Demaille [Thu, 12 Apr 2001 16:13:49 +0000 (16:13 +0000)]
* automake.in (Language): Add attributes `flags', `compile' and
`compiler'.
(&finish_languages, &handle_single_transform_list, &handle_dist)
(&add_depend2, ®ister_language): Use them and the `linker' and
`pure' attributes.
Akim Demaille [Thu, 12 Apr 2001 16:09:12 +0000 (16:09 +0000)]
* automake.in (&handle_single_transform_list, &finish_languages)
(&handle_dist, &handle_dependencies): Use the language object for
autodep and derived-autodep too.
Akim Demaille [Thu, 12 Apr 2001 15:44:56 +0000 (15:44 +0000)]
* automake.in (¯o_define): Ignore Automake definition for
($var, $cond) if there is already a user definition for ($var, $cond).
Akim Demaille [Thu, 12 Apr 2001 14:12:05 +0000 (14:12 +0000)]
* automake.in (&scan_texinfo_file): Catch @cindex and the like,
but also @deffn and so on which push data in indexes.
Reported by Derek R. Price.
Akim Demaille [Thu, 12 Apr 2001 09:13:45 +0000 (09:13 +0000)]
* automake.in (Language): New package, temporarily in this file.
Use Class::Struct.
(Automake): New package.
(%languages): New.
(&handle_single_transform_list): Use the language object's `ansi'
attribute instead of `$language_map{"$lang-ansi-p"}'.
(®ister_language): Build and register the language too.
Tom Tromey [Thu, 12 Apr 2001 05:45:23 +0000 (05:45 +0000)]
Fixes report from Larry Jones:
* automake.in (handle_dependencies): Add `@_am_quote@' where
appropriate.
* m4/make.m4 (AM_MAKE_INCLUDE): Handle BSD-style make.
Akim Demaille [Wed, 11 Apr 2001 17:29:06 +0000 (17:29 +0000)]
* depend2.am: Fix the `if' condition for Libtool.
Reported by Robert Boehne.
Tom Tromey [Wed, 11 Apr 2001 05:44:26 +0000 (05:44 +0000)]
2001-04-10 Robert Collins <robert.collins@itdomain.com.au>
* tests/subobj5.test: New file.
Tom Tromey [Wed, 11 Apr 2001 04:17:21 +0000 (04:17 +0000)]
2001-04-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* m4/make.m4 (AM_MAKE_INCLUDE): Pass `-s' to make.
* tests/Makefile.am (TESTS): Added make.test.
* tests/make.test: New file.
Tom Tromey [Wed, 11 Apr 2001 04:13:08 +0000 (04:13 +0000)]
* tests/defs: Changed how ACLOCAL and AUTOMAKE are set.
Tom Tromey [Tue, 10 Apr 2001 20:47:20 +0000 (20:47 +0000)]
2001-04-10 Derek R. Price <dprice@collab.net>
* tests/defs: Allow user to override AUTOMAKE and ACLOCAL.
Akim Demaille [Tue, 10 Apr 2001 12:41:05 +0000 (12:41 +0000)]
* distdir.am: Add a missing backslash.
Akim Demaille [Tue, 10 Apr 2001 09:21:00 +0000 (09:21 +0000)]
* automake.in (&scan_aclocal_m4): Handle $relative_dir and special
variables.
Specify to the caller whether $regen_aclocal_m4.
(&handle_configure): Adjust.
Transform `REGEN-ACLOCAL-M4'.
* configure.am: Use it.
* tests/defs (me): New.
* tests/configdeps.test: New.
Tom Tromey [Mon, 9 Apr 2001 23:21:13 +0000 (23:21 +0000)]
* m4/missing.m4 (AM_MISSING_HAS_RUN): Use `true', not `:'.
Fixes report from Jim Meyering.
Akim Demaille [Mon, 9 Apr 2001 18:25:39 +0000 (18:25 +0000)]
XFAIL: objc, subobj2.
Akim Demaille [Mon, 9 Apr 2001 16:12:11 +0000 (16:12 +0000)]
* automake.in (&handle_configure): Don't bother with optimizing
macro uses.
Akim Demaille [Mon, 9 Apr 2001 16:02:40 +0000 (16:02 +0000)]
* tests/cond3.test (expected): Adjust.
Akim Demaille [Mon, 9 Apr 2001 15:02:08 +0000 (15:02 +0000)]
* automake.in (&handle_single_transform_list): Remove $xbase,
unused.
(&handle_source_transform): All the variables have conditions now,
simplify.
(&variable_delete): Admit an argument @conds.
Akim Demaille [Mon, 9 Apr 2001 14:58:01 +0000 (14:58 +0000)]
* automake.in ($source_suffix_pattern): Remove, unused.
%extension_map seems to have replaced it.
Akim Demaille [Mon, 9 Apr 2001 14:56:30 +0000 (14:56 +0000)]
* ext-compile.am: New file.
* automake.in (&finish_languages): Output it.
Require a C linker if there are several registered source suffixes.
(&handle_compile): No longer push the `.c', `.o', `.obj', `.lo'
extensions, which are discovered in ext-compile.am.
With the help from Robert Boehne.
Akim Demaille [Mon, 9 Apr 2001 14:53:44 +0000 (14:53 +0000)]
* automake.in (&handle_compile): Extract from...
(&get_object_extension): here.
(&read_am_file): Call it.
($included_generic_compile, $included_knr_compile)
($included_libtool_compile): Remove.
($get_object_extension_was_run): New.
Akim Demaille [Mon, 9 Apr 2001 14:50:53 +0000 (14:50 +0000)]
Use AM_CONDITIONAL and if/endif for AMDEP.
* m4/depend.m4 (AM_DEP_TRACK): Use AM_CONDITIONAL to define AMDEP.
* automake.in (&add_depend2): Transform %AMDEP% into `AMDEP' (leading
to a configure time if/endif), or to `FALSE' (static removal of
the code).
(&handle_dependencies): Adjust to use `AMDEP_TRUE'.
* depend2.am: Use if/endif.
Adjust the 101 tests that use dependencies so that they
properly invoke aclocal before automake. They need to `see'
`AM_CONDITIONAL([AMDEP], ...)'.
Akim Demaille [Mon, 9 Apr 2001 14:48:34 +0000 (14:48 +0000)]
* tags.am: Fix missing leading tabs.
Akim Demaille [Mon, 9 Apr 2001 14:47:46 +0000 (14:47 +0000)]
* automake.in: Use simple quotes to define the _PATTERN variables
to unobfuscate the regexps.
($AM_CONDITIONAL_PATTERN): Let the user quote the variable.
Akim Demaille [Mon, 9 Apr 2001 14:46:45 +0000 (14:46 +0000)]
* automake.in (&rule_define): When you discover a suffix rules,
register the extensions for .SUFFIXES.
(&handle_texinfo): Don't register the suffixes.
(&get_object_extension): Don't register suffixes, let them be
discovered in depend2.am.
(&handle_emacs_lisp): Depend on your lisp.am.
* lisp.am: Include the rule &handle_emacs_lisp used to output.
Akim Demaille [Mon, 9 Apr 2001 14:44:04 +0000 (14:44 +0000)]
* subdirs.am: Don't define info related recursive targets.
* texinfos.am: Do.
Akim Demaille [Mon, 9 Apr 2001 14:40:11 +0000 (14:40 +0000)]
* subdirs.am (RECURSIVE_TARGETS): New variable.
Use it.
* automake.in (&handle_subdirs): Output it.
(&file_contents_internal): Support value spread on several lines.
Akim Demaille [Mon, 9 Apr 2001 14:38:35 +0000 (14:38 +0000)]
* automake.in (&handle_man_pages): Rely on mans.am to define
man%SECTION%dir and MANS.
* mans.am: Do it.
Akim Demaille [Mon, 9 Apr 2001 14:34:38 +0000 (14:34 +0000)]
* automake.in (&variable_dump): Use %var_type properly.
(¯o_define): Enforce better overriding rules.
Handle the special case that used to handle...
(&define_pretty_variable): this.
Hence, don't.
The variables you define are owned by Automake.
(&generate_makefile): PRE_INSTALL and co must not be defined *by
the user*.
(&variable_defined): Now independent from the owner.
(&variable_output, &variable_pretty_output): Adjust to %var_type.
Akim Demaille [Mon, 9 Apr 2001 14:30:22 +0000 (14:30 +0000)]
* automake.in (%var_was_plus_eq): Rename as...
(%var_type): this.
(%def_type): Remove.
(¯o_define): %var_type may now hold `', `+', or `:'.
(%conditional, %am_vars, %content_lines): Rename as...
(%var_value, %var_comment, %var_line): these.
Akim Demaille [Mon, 9 Apr 2001 14:28:09 +0000 (14:28 +0000)]
* automake.in (&variable_output): Admit a list of @CONDS.
(&variable_pretty_output): New.
(&define_pretty_variable): Use it.
(&read_am_file, &file_contents_internal): Prepend a separator to
$am_vars only if there is none yet.
(&file_contents_internal): Rename $separator as $spacing to
harmonize with &read_am_file.
Akim Demaille [Mon, 9 Apr 2001 14:23:09 +0000 (14:23 +0000)]
* automake.in (&am_install_var): Transform DIST, and let the *.am
files handle DIST_COMMON.
* data.am, header.am, java.am, list.am, python.am, script.am: Set
DIST_COMMON.