]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'remove-deansification'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 2 Sep 2011 08:31:19 +0000 (10:31 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 2 Sep 2011 08:31:19 +0000 (10:31 +0200)
* remove-deansification:
  automake: fix regression due to de-ansification support removal
  automake: cleanups after de-ansification support removal (2)
  automake: cleanups after de-ansification support removal (1)
  ansi: remove obsolete code/files for de-ANSI-fication support
  ansi: reject attempts to use automatic de-ANSI-fication support
  tests: remove tests about obsolete de-ANSI-fication support
  docs: remove description of de-ANSI-fication support from manual

1  2 
ChangeLog
doc/automake.texi
tests/Makefile.am
tests/Makefile.in

diff --cc ChangeLog
index 464e67d870ef90bbd15ce0211fa6f1696f323fa0,50cedb7f14cd96c490114b2be765c3a83e7f1366..b8c24f6d87c74e357b9637a2a3b334e06015ce72
+++ b/ChangeLog
+ 2011-09-01  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       automake: fix regression due to de-ansification support removal
+       The last change `v1.11-947-g136b489' removed code that automake
+       was using to decide whether binary objects were built by the
+       generated Makefile.in, so that it could avoid to emit unneeded
+       code when this was not the case.  Re-introduce such code in a
+       less-obfuscated form, and add a test to ensure we don't regress
+       again.
+       * automake.in ($must_handle_compiled_objects): New global
+       variable, telling whether the generated Makefile has to build
+       compiled objects.
+       (initialize_per_input): Reset it.
+       (handle_programs, handle_libraries, handle_ltlibraries): Set
+       it to a true value when required.
+       (handle_compile): Don't generate any code if the variable
+       `$must_handle_compiled_objects' is not set to a true value.
+       * tests/no-extra-makefile-code.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+ 2011-08-28  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       automake: cleanups after de-ansification support removal (2)
+       * automake.in ($get_object_extension_was_run): Remove, it's not
+       really needed anymore.
+       (&get_object_extension): Remove, it's a no-op now.
+       All callers adjusted.
+ 2011-08-28  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       automake: cleanups after de-ansification support removal (1)
+       * automake.in (lang_c_rewrite, handle_single_transform): Rename 
+       variable `$nonansi_obj' to `$obj'.
+ 2011-08-28  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       ansi: remove obsolete code/files for de-ANSI-fication support
+       * lib/ansi2knr.1, lib/ansi2knr.c: Deleted.
+       * lib/Makefile.am (dist_pkgvdata_DATA): Do not list them anymore.
+       * lib/am/ansi2knr.am: Delete.
+       * lib/am/Makefile.am (dist_am_DATA): Do not list it anymore.
+       * lib/Automake/Variable.pm (%_am_macro_for_var): Remove entries for
+       `ANSI2KNR' and `U'.
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Don't care anymore
+       about possible definition of the `$U' variable.
+       * automake.in (@common_files): Drop `ansi2knr.1' and `ansi2knr.c'.
+       (struct): Remove scalar field `ansi'.
+       All callers adjusted.
+       (&lang_c_finish, %de_ansi_files): Remove, they're not required
+       anymore.
+       All callers adjusted.
+       ($get_object_extension_was_run): Fix typo in comment.
+       (&get_object_extension): Drop code dealing with de-ansification;
+       this function basically a no-op now, but is required to properly
+       initialize `$get_object_extension_was_run' variable.
+       (&handle_languages, &handle_compile, &lang_c_rewrite): Drop code
+       dealing with de-ansification.
+ 2011-08-28  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       ansi: reject attempts to use automatic de-ANSI-fication support
+       * tests/protos.m4 (AM_C_PROTOTYPES): Error out whenever called.
+       * lib/Automake/Options.pm (_process_option_list ): Error out
+       with a proper error message when the `ansi2knr' option is used.
+       Related updates to comments.
+       * tests/depacl2.test: Update.
+       * tests/ansi2knr-no-more.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+       * NEWS: Update.
+ 2011-08-28  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       tests: remove tests about obsolete de-ANSI-fication support
+       * tests/ansi.test: Delete.
+       * tests/ansi10.test: Likewise.
+       * tests/ansi2.test: Likewise.
+       * tests/ansi2knr-deprecation.test: Likewise.
+       * tests/ansi3.test: Likewise.
+       * tests/ansi3b.test: Likewise.
+       * tests/ansi4.test: Likewise.
+       * tests/ansi5.test: Likewise.
+       * tests/ansi6.test: Likewise.
+       * tests/ansi7.test: Likewise.
+       * tests/ansi8.test: Likewise.
+       * tests/ansi9.test: Likewise.
+       * tests/cxxansi.test: Likewise.
+       * tests/libobj8.test: Likewise.
+       * tests/subobj3.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+ 2011-08-28  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       docs: remove description of de-ANSI-fication support from manual
+       * doc/automake.texi (Auxiliary Programs): Remove mention of
+       `ansi2knr.c' and `ansi2knr.1'.
+       (Obsolete Macros): Remove mention of `AM_C_PROTOTYPES'.  Do not
+       index it nor variables `ANSI2KNR' and `U' anymore.
+       (List of Automake options): Remove mention of `ansi2knr' option,
+       and obsolete entries for concept and option indexes.
+       (Optional): Remove entry about `AM_C_PROTOTYPES'.
+       (@c LocalWords): Remove `ansi' and `knr'.
+       (@menu, @detailmenu): Remove entries about de-ANSI-fication
+       support.
 +2011-09-02 Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      coverage: vala support failing for VPATH from-scratch builds
 +      * tests/vala-vpath.test: New test, xfailing.
 +      * tests/Makefile.am (TESTS): Update.
 +      * THANKS: Update.
 +      From a report by Zbigniew JÄ™drzejewski-Szmek.
 +      Related to automake bug#8753.
 +
 +2011-09-01  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      docs: report few more automake parsing limitations
 +      Partly motivated by automake bug#8360.
 +      * doc/automake.texi (General Operation): Report few more automake
 +      limitations w.r.t. parsing of unusual makefile constructs.  Related
 +      minor reorderings.
 +      * tests/doc-parsing-buglets-colneq-subst.test: New test.
 +      * tests/doc-parsing-buglets-tabs.test: Likewise.
 +      * tests/Makefile.am (TESTS): Update.
 +
  2011-08-25  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        tests: list "forgotten" test script in TESTS
Simple merge
Simple merge
Simple merge