From 16f67b47492d97cac0866b02304b08fdde4d069e Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 28 Aug 2011 15:52:11 +0200 Subject: 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. --- lib/Automake/Options.pm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'lib/Automake') diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm index e8765fdf1..6836157a3 100644 --- a/lib/Automake/Options.pm +++ b/lib/Automake/Options.pm @@ -71,8 +71,7 @@ Fs. =cut -# Values are the Automake::Location of the definition, except -# for 'ansi2knr' whose value is a pair [filename, Location]. +# Values are the Automake::Location of the definition. use vars '%_options'; # From AUTOMAKE_OPTIONS use vars '%_global_options'; # from AM_INIT_AUTOMAKE or the command line. @@ -269,14 +268,9 @@ sub _process_option_list (\%@) } elsif (/^(.*\/)?ansi2knr$/) { - # This feature is deprecated, will be removed in the next - # Automake major release. - msg 'obsolete', $where, - "automatic de-ANSI-fication support is deprecated\n"; - # An option like "../lib/ansi2knr" is allowed. With no - # path prefix, we assume the required programs are in this - # directory. We save the actual option for later. - $options->{'ansi2knr'} = [$_, $where]; + # Obsolete (and now removed) de-ANSI-fication support. + error ($where, + "automatic de-ANSI-fication support has been removed"); } elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo' || $_ eq 'dist-shar' || $_ eq 'dist-zip' -- cgit v1.2.1 From c8d4c3f4b21b598302f2310f6fcc747cf92f8d64 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 28 Aug 2011 16:09:50 +0200 Subject: 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. --- lib/Automake/Variable.pm | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib/Automake') diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm index 24d8be0ff..cd57877ae 100644 --- a/lib/Automake/Variable.pm +++ b/lib/Automake/Variable.pm @@ -156,7 +156,6 @@ my %_gen_varname_n = (); # Macros accessible via aclocal. my %_am_macro_for_var = ( - ANSI2KNR => 'AM_C_PROTOTYPES', CCAS => 'AM_PROG_AS', CCASFLAGS => 'AM_PROG_AS', EMACS => 'AM_PATH_LISPDIR', @@ -169,7 +168,6 @@ my %_am_macro_for_var = pyexecdir => 'AM_PATH_PYTHON', PYTHON => 'AM_PATH_PYTHON', pythondir => 'AM_PATH_PYTHON', - U => 'AM_C_PROTOTYPES', ); # Macros shipped with Autoconf. -- cgit v1.2.1 From 136b48998f4a5db717e16200fcdf4bb907703646 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 28 Aug 2011 22:38:50 +0200 Subject: 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. --- lib/Automake/Makefile.in | 33 +++++++++++++++++++++------------ lib/Automake/tests/Makefile.in | 30 +++++++++++++++++++----------- 2 files changed, 40 insertions(+), 23 deletions(-) (limited to 'lib/Automake') diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 8719084de..c46114113 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -66,6 +66,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +DEFAULT_INCLUDES = -I.@am__isrc@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; @@ -306,6 +307,12 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c install-dist_perllibDATA: $(dist_perllib_DATA) @$(NORMAL_INSTALL) test -z "$(perllibdir)" || $(MKDIR_P) "$(DESTDIR)$(perllibdir)" @@ -603,7 +610,8 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-recursive @@ -651,7 +659,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive -mostlyclean-am: mostlyclean-generic +mostlyclean-am: mostlyclean-compile mostlyclean-generic pdf: pdf-recursive @@ -670,16 +678,17 @@ uninstall-am: uninstall-dist_perllibDATA uninstall-nodist_perllibDATA .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic cscopelist \ cscopelist-recursive ctags ctags-recursive distclean \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dist_perllibDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-nodist_perllibDATA install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + distclean-compile distclean-generic distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dist_perllibDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-nodist_perllibDATA install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ uninstall-dist_perllibDATA uninstall-nodist_perllibDATA diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index 967a95286..d6b9d41fc 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -63,6 +63,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +DEFAULT_INCLUDES = -I.@am__isrc@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; @@ -346,6 +347,12 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c tags: TAGS TAGS: @@ -556,7 +563,7 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic +distclean-am: clean-am distclean-compile distclean-generic dvi: dvi-am @@ -604,7 +611,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-generic +mostlyclean-am: mostlyclean-compile mostlyclean-generic pdf: pdf-am @@ -620,15 +627,16 @@ uninstall-am: recheck-html .PHONY: all all-am check check-TESTS check-am check-html clean \ - clean-generic distclean distclean-generic distdir dvi dvi-am \ - html html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am recheck recheck-html uninstall uninstall-am + clean-generic distclean distclean-compile distclean-generic \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + recheck recheck-html uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. -- cgit v1.2.1 From 199b9086f51927fb99663cac42934337352cce69 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Thu, 1 Sep 2011 11:02:04 +0200 Subject: 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. --- lib/Automake/Makefile.in | 33 ++++++++++++--------------------- lib/Automake/tests/Makefile.in | 30 +++++++++++------------------- 2 files changed, 23 insertions(+), 40 deletions(-) (limited to 'lib/Automake') diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index c46114113..8719084de 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -66,7 +66,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -DEFAULT_INCLUDES = -I.@am__isrc@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; @@ -307,12 +306,6 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c install-dist_perllibDATA: $(dist_perllib_DATA) @$(NORMAL_INSTALL) test -z "$(perllibdir)" || $(MKDIR_P) "$(DESTDIR)$(perllibdir)" @@ -610,8 +603,7 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -659,7 +651,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive -mostlyclean-am: mostlyclean-compile mostlyclean-generic +mostlyclean-am: mostlyclean-generic pdf: pdf-recursive @@ -678,17 +670,16 @@ uninstall-am: uninstall-dist_perllibDATA uninstall-nodist_perllibDATA .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic cscopelist \ cscopelist-recursive ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_perllibDATA \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-nodist_perllibDATA install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dist_perllibDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-nodist_perllibDATA install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ uninstall-dist_perllibDATA uninstall-nodist_perllibDATA diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index d6b9d41fc..967a95286 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -63,7 +63,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -DEFAULT_INCLUDES = -I.@am__isrc@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; @@ -347,12 +346,6 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c tags: TAGS TAGS: @@ -563,7 +556,7 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -611,7 +604,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-compile mostlyclean-generic +mostlyclean-am: mostlyclean-generic pdf: pdf-am @@ -627,16 +620,15 @@ uninstall-am: recheck-html .PHONY: all all-am check check-TESTS check-am check-html clean \ - clean-generic distclean distclean-compile distclean-generic \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - recheck recheck-html uninstall uninstall-am + clean-generic distclean distclean-generic distdir dvi dvi-am \ + html html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am recheck recheck-html uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. -- cgit v1.2.1