multilib: move to contrib
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 21 Jan 2012 10:33:44 +0000 (11:33 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 24 Jan 2012 08:24:22 +0000 (09:24 +0100)
commitbd34a47c51ebc57cce6e9e184630ced52dc71203
tree21176acf3e4d33aa9c1351b803cff6cb7794c529
parent3794d01e0d62f5f93118ca6b3c75ddc84995d541
multilib: move to contrib

This follows up on commit v1.11-665-gc5df21e of 2012-01-17,
"multilib: deprecate, will be moved to contrib".  See also:
<http://lists.gnu.org/archive/html/automake-patches/2012-01/msg00109.html>

* NEWS: Update.
* automake.in ($seen_multilib): Remove.
(scan_autoconf_traces): Don't trace 'AM_ENABLE_MULTILIB', and don't
handle it anymore.
(handle_multilib): Remove.
(generate_makefile): Don't call it anymore.
* doc/automake.texi: Remove documentation about multilib support,
related macros, and helper files.
* m4/multi.m4: Delete.
* m4/Makefile.am (dist_automake_ac_DATA): Remove it.
* lib/am/multilib.am: Delete.
* lib/am/Makefile.am (dist_am_DATA): Remove it.
* contrib/multilib/multilib.am: New file, adapted from extracts of
a Makefile.in generated with automake multilib support.  We did
this instead of moving and editing 'lib/am/multilib.am' because it
allows us to license this file with a liberal license that will
permit users to copy-and-paste it in non-GPLed Makefile.am files
too).
* lib/symlink-tree, lib/config-ml.in: Move ...
* contrib/multilib: ... in here.
* lib/Makefile.am (dist_script_DATA, dist_pkgvdata_DATA): Update.
* contrib/multilib/README: New file.
* contrib/Makefile.am (EXTRA_DIST): Add the files created or moved
in 'contrib/multlib'.
* tests/multilib.test: Update and enhance a little.
* tests/help-multilib.test: Likewise.
15 files changed:
NEWS
automake.in
contrib/Makefile.am
contrib/multilib/README [new file with mode: 0644]
contrib/multilib/config-ml.in [moved from lib/config-ml.in with 100% similarity]
contrib/multilib/multilib.am [new file with mode: 0644]
contrib/multilib/symlink-tree [moved from lib/symlink-tree with 100% similarity]
doc/automake.texi
lib/Makefile.am
lib/am/Makefile.am
lib/am/multilib.am [deleted file]
m4/Makefile.am
m4/multi.m4 [deleted file]
tests/help-multilib.test
tests/multlib.test