From 6a675ef17edf7109da189f5ae70e2dc6b7665896 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Wed, 24 Dec 2014 10:57:17 +0100 Subject: deps: 'subdir-object' option now works when foo_SOURCES contains $(var) Following a suggestions of Johan Kristensen, we have config.status use 'make' invocations rather than Makefile-parsing 'sed' hacks to bootstrap the dependency-tracking '.Po' and '.Plo' makefile fragments. To handle the inclusion of such files that are still missing when make is first we basically generate a temporary Makefile without these includes, and call 'make' on that Makefile. This fixes the serious bug bug#13928, which was an hard blocker to make the behavior mandated by the 'subdir-object' active by default (which we want to do in Automake 2.0). The issue has also been reported in bug#15919. * NEWS, THANKS: Update. * bin/automake.in (handle_languages): Add a trailing "marking" comment ("# am--include-marker") to the generated Makefile lines issuing 'include' directives for the dependency-tracking '.Po' and '.Plo' makefile fragments. Also rename the generated Makefile variable 'am__depfiles_maybe' to the clearer 'am__maybe_remake_depfiles'. Minor unrelated refactoring. * lib/am/configure.am: Adjust to account for the 'am__depfiles_maybe' -> 'am__maybe_remake_depfiles' renaming. * lib/am/depend.am: Add rules to generate a dummy version of all the dependency-tracking '.Po' and '.Plo' makefile fragments. * m4/depout.m4: Use make invocations rather than Makefile-parsing sed hacks to bootstrap the dependency-tracking '.Po' and '.Plo' makefile fragments. We still use some sed trickery in order to remove the inclusion of the still non existing .Po and .Plo files from the Makefile we invoke make upon; this is done stripping lines that contain the magic string "# am--include-marker". * m4/make.m4 (AM_MAKE_INCLUDE): Given that now automake generates Makefiles containing include statements with trailing comment, adjust the checks done here to make sure $MAKE support that; e.g., "include foo.mk # comment" rather than just "include foo.mk". Also refactor and adjust to leave better debugging info in config.log. * t/postproc.sh: Rename ... * t/depend-postproc.sh: ... to this, and adjust and enhance. * t/list-of-tests.mk (handwritten_TESTS): Adjust. (XFAIL_TESTS): Remove 't/subobj-indir-pr13928.sh', which is now succeeding. * t/subobj-indir-pr13928.sh: Simplify slightly, now that we expect it to pass. * t/depcomp8a.sh: Adjust grepping check to account for the changes in the generated Makefile, and tp be somewhat more robust in light of possible future modifications. * t/depcomp8b.sh: Likewise. * t/subobj11b.sh: Likewise. * t/subobj11c.sh: Likewise. * t/extra-sources.sh: Likewise. * t/lex-depend-grep.sh: Likewise. * t/lex-depend-cxx.sh: Add a command to help debugging in case of test failure. Helped-by: Johan Kristensen Signed-off-by: Stefano Lattarini --- lib/am/configure.am | 6 +++--- lib/am/depend.am | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'lib/am') diff --git a/lib/am/configure.am b/lib/am/configure.am index 0f1abac38..ad6717b41 100644 --- a/lib/am/configure.am +++ b/lib/am/configure.am @@ -76,10 +76,10 @@ endif %?TOPDIR_P% ?TOPDIR_P? $(SHELL) ./config.status;; \ ?!TOPDIR_P? cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ -## FIXME: $(am__depfiles_maybe) lets us re-run the rule to create the +## FIXME: $(am__maybe_remake_depfiles) lets us re-run the rule to create the ## .P files. Ideally we wouldn't have to do this by hand. - echo ' cd $(top_builddir) && $(SHELL) ./config.status %CONFIG-MAKEFILE% $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status %CONFIG-MAKEFILE% $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status %CONFIG-MAKEFILE% $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status %CONFIG-MAKEFILE% $(am__maybe_remake_depfiles);; \ esac; ## Avoid the "deleted header file" problem for the dependencies. diff --git a/lib/am/depend.am b/lib/am/depend.am index 54ea220fe..3711d5d12 100644 --- a/lib/am/depend.am +++ b/lib/am/depend.am @@ -16,6 +16,13 @@ am__mv = mv -f +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) +.PHONY: am--depfiles + ## This Makefile depends on Depdirs' files, so we should never ## erase them in -am or -recursive rules; that would prevent any other ## rules from being recursive (for instance multilib clean rules are -- cgit v1.2.1 From 08849db866b44510f6b8fd49e313c91a43a3dfd3 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sat, 3 Jan 2015 01:33:45 +0100 Subject: deps: fix corner-case "make distclean" bug Assume we have package satisfying the following conditions: (1) automatic dependency tracking is enabled; (2) the 'subdir-objects' Automake option is enabled; (3) the package uses a recursive make setup. Also assume that: (a) a subdir Makefile declares a foo_SOURCES variable containing a source file in the parent directory; (b) that parent Makefile declare a compiled program itself. Then BSD and Solaris make used to fail when running "make distclean", because the 'distclean' target of the subdir Makefile removed the whole '.deps' directory before the parent Makefile was done with the included '.Po' makefile fragments in that directory. This issue was revealed by failures in the 'subobj-vpath-pr13928.sh' test when those make implementations were used. We fix the issue by ensuring the 'distclean' target of any Makefile only removed the '.Po' makefile fragments included by it, rather than the whole '.deps' directory where such files resides. This change should be the last step in fixing automake bug#13928 for good. * bin/automake.in (handle_languages), lib/am/depend.am: Adjust to implement the new 'distclean' logic. * t/pr224.sh: Adjust to avoid a spurious failure. * PLANS/subdir-objects.txt: Update. Signed-off-by: Stefano Lattarini --- lib/am/depend.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/am') diff --git a/lib/am/depend.am b/lib/am/depend.am index 3711d5d12..7fb8bb9be 100644 --- a/lib/am/depend.am +++ b/lib/am/depend.am @@ -27,8 +27,9 @@ am--depfiles: $(am__depfiles_remade) ## erase them in -am or -recursive rules; that would prevent any other ## rules from being recursive (for instance multilib clean rules are ## recursive). +if %?DISTRMS% distclean: - -rm -rf %DEPDIRS% - + %DISTRMS% maintainer-clean: - -rm -rf %DEPDIRS% + %DISTRMS% +endif -- cgit v1.2.1 From 3126fa4c6b69c043e20af9381563069c0f2a0ba0 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Sat, 15 Jul 2017 22:24:43 +0200 Subject: dejagnu: Allow AM_RUNTESTFLAGS to override default RUNTEST arguments This fixes bug#25335. * lib/am/dejagnu.am (check-DEJAGNU): Swap $(RUNTESTDEFAULTFLAGS) and $(AM_RUNTESTFLAGS). * THANKS: Update. --- lib/am/dejagnu.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/am') diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am index 75ec97dca..04e97e2b1 100644 --- a/lib/am/dejagnu.am +++ b/lib/am/dejagnu.am @@ -33,7 +33,7 @@ check-DEJAGNU: site.exp ## pointless to cause a failure if the tests cannot be run at all. if $(SHELL) -c "$(RUNTEST) --version" > /dev/null 2>&1; then \ exit_status=0; l='$(DEJATOOL)'; for tool in $$l; do \ - if $(RUNTEST) $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \ + if $(RUNTEST) $(RUNTESTDEFAULTFLAGS) $(AM_RUNTESTFLAGS) $(RUNTESTFLAGS); \ then :; else exit_status=1; fi; \ done; \ else echo "WARNING: could not find '$(RUNTEST)'" 1>&2; :;\ -- cgit v1.2.1 From 8555e7b81d0d68e1e8105d072d69b94788953e15 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Sun, 16 Jul 2017 00:11:07 +0200 Subject: check: Make 'check-TESTS' target depend on test dependencies The 'check' and 'recheck' targets are already depending on the progams and scripts required to run the test suite. The 'check-TESTS' target while not in the public API might be used by uninformed users, so it makes sense to add the same dependency to it. This fixes bug#27186. * lib/am/check.am [!%?SERIAL_TESTS%] (check-TESTS): Add dependency to '%CHECK_DEPS%'. * THANKS: Update. --- lib/am/check.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/am') diff --git a/lib/am/check.am b/lib/am/check.am index 741a5c0f0..ff174191d 100644 --- a/lib/am/check.am +++ b/lib/am/check.am @@ -401,7 +401,7 @@ RECHECK_LOGS = $(TEST_LOGS) ## Running all tests, or rechecking failures. ## ## ------------------------------------------ ## -check-TESTS: +check-TESTS: %CHECK_DEPS% @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list ## We always have to remove $(TEST_SUITE_LOG), to ensure its rule is run -- cgit v1.2.1 From e94c0186d98d70df2f18c17622ee75f80f95e17b Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Thu, 31 Aug 2017 14:42:13 +0200 Subject: build: Rename "Makefile.inc" Makefile fragments to "local.mk" This is done to follow a convention used by a lot of GNU packages. * bin/Makefile.inc: Rename to ... * bin/local.mk: ... this. * doc/Makefile.inc: Rename to ... * doc/local.mk: ... this. * lib/Automake/Makefile.inc: Rename to ... * lib/Automake/local.mk: ... this. * lib/am/Makefile.inc: Rename to ... * lib/am/local.mk: ... this. * lib/Makefile.inc: Rename to ... * lib/local.mk: ... this. * m4/Makefile.inc: Rename to ... * m4/local.mk: ... this. * contrib/t/Makefile.inc: Rename to ... * contrib/t/local.mk: ... this. * t/Makefile.inc: Rename to ... * t/local.mk: ... this. Adapt. * Makefile.am: Adapt. --- lib/am/Makefile.inc | 65 ----------------------------------------------------- lib/am/local.mk | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 65 deletions(-) delete mode 100644 lib/am/Makefile.inc create mode 100644 lib/am/local.mk (limited to 'lib/am') diff --git a/lib/am/Makefile.inc b/lib/am/Makefile.inc deleted file mode 100644 index 270bb7347..000000000 --- a/lib/am/Makefile.inc +++ /dev/null @@ -1,65 +0,0 @@ -## Included by top-level Makefile for Automake. - -## Copyright (C) 1995-2017 Free Software Foundation, Inc. -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2, or (at your option) -## any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . - -## --------------------- ## -## Makefile fragments. ## -## --------------------- ## - -amdir = @amdir@ - -dist_am_DATA = \ - %D%/check.am \ - %D%/check2.am \ - %D%/clean-hdr.am \ - %D%/clean.am \ - %D%/compile.am \ - %D%/configure.am \ - %D%/data.am \ - %D%/dejagnu.am \ - %D%/depend.am \ - %D%/depend2.am \ - %D%/distdir.am \ - %D%/footer.am \ - %D%/header-vars.am \ - %D%/header.am \ - %D%/install.am \ - %D%/inst-vars.am \ - %D%/java.am \ - %D%/lang-compile.am \ - %D%/lex.am \ - %D%/library.am \ - %D%/libs.am \ - %D%/libtool.am \ - %D%/lisp.am \ - %D%/ltlib.am \ - %D%/ltlibrary.am \ - %D%/mans-vars.am \ - %D%/mans.am \ - %D%/program.am \ - %D%/progs.am \ - %D%/python.am \ - %D%/remake-hdr.am \ - %D%/scripts.am \ - %D%/subdirs.am \ - %D%/tags.am \ - %D%/texi-vers.am \ - %D%/texibuild.am \ - %D%/texinfos.am \ - %D%/vala.am \ - %D%/yacc.am - -# vim: ft=automake noet diff --git a/lib/am/local.mk b/lib/am/local.mk new file mode 100644 index 000000000..270bb7347 --- /dev/null +++ b/lib/am/local.mk @@ -0,0 +1,65 @@ +## Included by top-level Makefile for Automake. + +## Copyright (C) 1995-2017 Free Software Foundation, Inc. +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2, or (at your option) +## any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . + +## --------------------- ## +## Makefile fragments. ## +## --------------------- ## + +amdir = @amdir@ + +dist_am_DATA = \ + %D%/check.am \ + %D%/check2.am \ + %D%/clean-hdr.am \ + %D%/clean.am \ + %D%/compile.am \ + %D%/configure.am \ + %D%/data.am \ + %D%/dejagnu.am \ + %D%/depend.am \ + %D%/depend2.am \ + %D%/distdir.am \ + %D%/footer.am \ + %D%/header-vars.am \ + %D%/header.am \ + %D%/install.am \ + %D%/inst-vars.am \ + %D%/java.am \ + %D%/lang-compile.am \ + %D%/lex.am \ + %D%/library.am \ + %D%/libs.am \ + %D%/libtool.am \ + %D%/lisp.am \ + %D%/ltlib.am \ + %D%/ltlibrary.am \ + %D%/mans-vars.am \ + %D%/mans.am \ + %D%/program.am \ + %D%/progs.am \ + %D%/python.am \ + %D%/remake-hdr.am \ + %D%/scripts.am \ + %D%/subdirs.am \ + %D%/tags.am \ + %D%/texi-vers.am \ + %D%/texibuild.am \ + %D%/texinfos.am \ + %D%/vala.am \ + %D%/yacc.am + +# vim: ft=automake noet -- cgit v1.2.1 From 3562e384f43bbd9d48598904a82a792039f4ce33 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 16 Sep 2017 13:03:36 -0700 Subject: Prefer https: URLs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Gnulib, Emacs, etc. we are changing ftp: and http: URLs to use https:, to discourage man-in-the-middle attacks when downloading software. The attached patch propagates these changes upstream to Automake. This patch does not affect files that Automake is downstream of, which I'll patch separately. Althouth the resources are not secret, plain HTTP is vulnerable to malicious routers that tamper with responses from GNU servers, and this sort of thing is all too common when people in some other countries browse US-based websites. See, for example: Aceto G, Botta A, Pescapé A, Awan MF, Ahmad T, Qaisar S. Analyzing internet censorship in Pakistan. RTSI 2016. https://dx.doi.org/10.1109/RTSI.2016.7740626 HTTPS is not a complete solution here, but it can be a significant help. The GNU project regularly serves up code to users, so we should take some care here. --- lib/am/check.am | 4 ++-- lib/am/check2.am | 2 +- lib/am/clean-hdr.am | 2 +- lib/am/clean.am | 2 +- lib/am/compile.am | 2 +- lib/am/configure.am | 2 +- lib/am/data.am | 2 +- lib/am/dejagnu.am | 2 +- lib/am/depend.am | 2 +- lib/am/depend2.am | 2 +- lib/am/distdir.am | 2 +- lib/am/footer.am | 2 +- lib/am/header-vars.am | 2 +- lib/am/header.am | 2 +- lib/am/inst-vars.am | 2 +- lib/am/install.am | 2 +- lib/am/java.am | 2 +- lib/am/lang-compile.am | 2 +- lib/am/lex.am | 2 +- lib/am/library.am | 2 +- lib/am/libs.am | 2 +- lib/am/libtool.am | 2 +- lib/am/lisp.am | 2 +- lib/am/local.mk | 2 +- lib/am/ltlib.am | 2 +- lib/am/ltlibrary.am | 2 +- lib/am/mans-vars.am | 2 +- lib/am/mans.am | 2 +- lib/am/program.am | 2 +- lib/am/progs.am | 2 +- lib/am/python.am | 2 +- lib/am/remake-hdr.am | 2 +- lib/am/scripts.am | 2 +- lib/am/subdirs.am | 3 +-- lib/am/tags.am | 2 +- lib/am/texi-vers.am | 2 +- lib/am/texibuild.am | 6 +++--- lib/am/texinfos.am | 6 +++--- lib/am/vala.am | 2 +- lib/am/yacc.am | 2 +- 40 files changed, 45 insertions(+), 46 deletions(-) (limited to 'lib/am') diff --git a/lib/am/check.am b/lib/am/check.am index ff174191d..9b05fc2c4 100644 --- a/lib/am/check.am +++ b/lib/am/check.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ @@ -390,7 +390,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) ## Be sure to exit with the proper exit status. The use of "exit 1" below ## is required to work around a FreeBSD make bug (present only when running ## in concurrent mode). See automake bug#9245: -## +## ## and FreeBSD PR bin/159730: ## . $$success || exit 1 diff --git a/lib/am/check2.am b/lib/am/check2.am index 1a1c34fe8..fbf4c7786 100644 --- a/lib/am/check2.am +++ b/lib/am/check2.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . if %?FIRST% ## When BSD make is run in parallel mode, it apparently strips any diff --git a/lib/am/clean-hdr.am b/lib/am/clean-hdr.am index 9a12b6915..1de69a28b 100644 --- a/lib/am/clean-hdr.am +++ b/lib/am/clean-hdr.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . .PHONY: distclean-hdr distclean-am: distclean-hdr diff --git a/lib/am/clean.am b/lib/am/clean.am index 59d9544b0..e4a7fdb25 100644 --- a/lib/am/clean.am +++ b/lib/am/clean.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . ## We must test each macro because it might be empty, and an empty "rm ## -rf" command looks disturbing. Also, the Solaris 2.4 "rm" will diff --git a/lib/am/compile.am b/lib/am/compile.am index c45b04f62..c92e72d4f 100644 --- a/lib/am/compile.am +++ b/lib/am/compile.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . DEFAULT_INCLUDES = %DEFAULT_INCLUDES% diff --git a/lib/am/configure.am b/lib/am/configure.am index ec0b293ad..6f0c50883 100644 --- a/lib/am/configure.am +++ b/lib/am/configure.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . ## This dummy rule is called from subdirectories whenever one of the diff --git a/lib/am/data.am b/lib/am/data.am index 6facf0acd..34b582f46 100644 --- a/lib/am/data.am +++ b/lib/am/data.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . if %?INSTALL% include inst-vars.am diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am index 04e97e2b1..4aa8f9cc2 100644 --- a/lib/am/dejagnu.am +++ b/lib/am/dejagnu.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . ## Name of tool to use. Default is the same as the package. DEJATOOL = $(PACKAGE) diff --git a/lib/am/depend.am b/lib/am/depend.am index 8ce0cd4c7..1538036c5 100644 --- a/lib/am/depend.am +++ b/lib/am/depend.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . am__mv = mv -f diff --git a/lib/am/depend2.am b/lib/am/depend2.am index e7a90bf86..45dd88c5e 100644 --- a/lib/am/depend2.am +++ b/lib/am/depend2.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . ## This file is read several times: ## - once per *extension* (not per language) for generic compilation rules diff --git a/lib/am/distdir.am b/lib/am/distdir.am index 200bdba66..653966f0e 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . DIST_COMMON += $(am__DIST_COMMON) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/lib/am/footer.am b/lib/am/footer.am index 07f538805..7291df1c8 100644 --- a/lib/am/footer.am +++ b/lib/am/footer.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index 309468491..10066b397 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . VPATH = @srcdir@ diff --git a/lib/am/header.am b/lib/am/header.am index f2a0e9559..d4dba1285 100644 --- a/lib/am/header.am +++ b/lib/am/header.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . ## Exactly the same as data.am. diff --git a/lib/am/inst-vars.am b/lib/am/inst-vars.am index 5581f679c..2f2824522 100644 --- a/lib/am/inst-vars.am +++ b/lib/am/inst-vars.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . if %?FIRST% diff --git a/lib/am/install.am b/lib/am/install.am index 5adcb52c0..6ba28e732 100644 --- a/lib/am/install.am +++ b/lib/am/install.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . ## ----------------------------------------- ## ## installdirs -- Creating the installdirs. ## diff --git a/lib/am/java.am b/lib/am/java.am index 6398f0e6d..4f78e533d 100644 --- a/lib/am/java.am +++ b/lib/am/java.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . ## ---------- ## diff --git a/lib/am/lang-compile.am b/lib/am/lang-compile.am index 545e0cf4e..b6c5434b5 100644 --- a/lib/am/lang-compile.am +++ b/lib/am/lang-compile.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . ## This file is read once per *language*, not per extension. diff --git a/lib/am/lex.am b/lib/am/lex.am index c28674d11..b57bc5c90 100644 --- a/lib/am/lex.am +++ b/lib/am/lex.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . ## See the comment about am__skipyacc in yacc.am. if %?MAINTAINER-MODE% diff --git a/lib/am/library.am b/lib/am/library.am index 8bb1390ae..19a7f1a01 100644 --- a/lib/am/library.am +++ b/lib/am/library.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . %LIBRARY%: $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_DEPENDENCIES) $(EXTRA_%XLIBRARY%_DEPENDENCIES) %DIRSTAMP% %SILENT%-rm -f %LIBRARY% diff --git a/lib/am/libs.am b/lib/am/libs.am index 77f91787b..377fdc552 100644 --- a/lib/am/libs.am +++ b/lib/am/libs.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . if %?INSTALL% include inst-vars.am diff --git a/lib/am/libtool.am b/lib/am/libtool.am index a2f1ae55e..9b882d918 100644 --- a/lib/am/libtool.am +++ b/lib/am/libtool.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . .PHONY: mostlyclean-libtool clean-libtool distclean-libtool mostlyclean-am: mostlyclean-libtool diff --git a/lib/am/lisp.am b/lib/am/lisp.am index 8085e3f0d..881bf3457 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . if %?INSTALL% include inst-vars.am diff --git a/lib/am/local.mk b/lib/am/local.mk index 270bb7347..3c2d9ba39 100644 --- a/lib/am/local.mk +++ b/lib/am/local.mk @@ -13,7 +13,7 @@ ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . ## --------------------- ## ## Makefile fragments. ## diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am index 45f020327..b99f0bf0a 100644 --- a/lib/am/ltlib.am +++ b/lib/am/ltlib.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . if %?INSTALL% include inst-vars.am diff --git a/lib/am/ltlibrary.am b/lib/am/ltlibrary.am index ce4c1faf5..a7a2c380b 100644 --- a/lib/am/ltlibrary.am +++ b/lib/am/ltlibrary.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . %LTLIBRARY%: $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_DEPENDENCIES) $(EXTRA_%XLTLIBRARY%_DEPENDENCIES) %DIRSTAMP% %VERBOSE%$(%XLINK%) %RPATH% $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_LIBADD) $(LIBS) diff --git a/lib/am/mans-vars.am b/lib/am/mans-vars.am index 24b9e20c0..3b0f49dff 100644 --- a/lib/am/mans-vars.am +++ b/lib/am/mans-vars.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . NROFF = nroff ## We don't really need this, but we use it in case we ever want to diff --git a/lib/am/mans.am b/lib/am/mans.am index 85c180821..59d9dd4a2 100644 --- a/lib/am/mans.am +++ b/lib/am/mans.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . include inst-vars.am man%SECTION%dir = $(mandir)/man%SECTION% diff --git a/lib/am/program.am b/lib/am/program.am index ba1bbb553..d2fe0e0a5 100644 --- a/lib/am/program.am +++ b/lib/am/program.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . %PROGRAM%%EXEEXT%: $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_DEPENDENCIES) $(EXTRA_%XPROGRAM%_DEPENDENCIES) %DIRSTAMP% ## Remove program before linking. Otherwise the link will fail if the diff --git a/lib/am/progs.am b/lib/am/progs.am index 4c94b5b19..cbea73012 100644 --- a/lib/am/progs.am +++ b/lib/am/progs.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . ## ------------ ## ## Installing. ## diff --git a/lib/am/python.am b/lib/am/python.am index e20f602cf..5c438d51d 100644 --- a/lib/am/python.am +++ b/lib/am/python.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . if %?INSTALL% include inst-vars.am diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am index dd26e4ef5..52510abdc 100644 --- a/lib/am/remake-hdr.am +++ b/lib/am/remake-hdr.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . %CONFIG_H%: %STAMP% ## Recover from removal of CONFIG_HEADER. diff --git a/lib/am/scripts.am b/lib/am/scripts.am index 5422392af..6a9a23e56 100644 --- a/lib/am/scripts.am +++ b/lib/am/scripts.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . if %?INSTALL% include inst-vars.am diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am index 84102493c..db681ba73 100644 --- a/lib/am/subdirs.am +++ b/lib/am/subdirs.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . RECURSIVE_TARGETS += all-recursive check-recursive installcheck-recursive RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ @@ -73,4 +73,3 @@ mostlyclean: mostlyclean-recursive clean: clean-recursive distclean: distclean-recursive maintainer-clean: maintainer-clean-recursive - diff --git a/lib/am/tags.am b/lib/am/tags.am index 7a93cde93..151402e23 100644 --- a/lib/am/tags.am +++ b/lib/am/tags.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am index 1806c3eac..841f7d7cb 100644 --- a/lib/am/texi-vers.am +++ b/lib/am/texi-vers.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . DIST_COMMON += %VTEXI% %STAMPVTI% diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am index 6c9265bd2..e2d1b669f 100644 --- a/lib/am/texibuild.am +++ b/lib/am/texibuild.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . ?GENERIC_INFO?%SOURCE_SUFFIX%%DEST_SUFFIX%: @@ -73,7 +73,7 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX% ## each file (and distinct from that of the corresponding PDF file) to ## avoid hitting a Texinfop bug that could cause low-probability racy ## failure when doing parallel builds; see: -## http://lists.gnu.org/archive/html/automake-patches/2012-06/msg00073.html +## https://lists.gnu.org/archive/html/automake-patches/2012-06/msg00073.html $(TEXI2DVI) %TEXIQUIET% --build-dir=$(@:.dvi=.t2d) -o $@ %TEXIDEVNULL% \ ?GENERIC? %SOURCE% ?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% @@ -92,7 +92,7 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX% ## each file (and distinct from that of the corresponding DVI file) to ## avoid hitting a Texinfop bug that could cause low-probability racy ## failure when doing parallel builds; see: -## http://lists.gnu.org/archive/html/automake-patches/2012-06/msg00073.html +## https://lists.gnu.org/archive/html/automake-patches/2012-06/msg00073.html $(TEXI2PDF) %TEXIQUIET% --build-dir=$(@:.pdf=.t2p) -o $@ %TEXIDEVNULL% \ ?GENERIC? %SOURCE% ?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index 2997a16b3..a2a21e667 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -13,7 +13,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . ## ----------- ## ## Variables. ## @@ -159,9 +159,9 @@ install-html-am: $(HTMLS) $(am__strip_dir) \ ## This indirection is required to work around a bug of the Solaris 10 ## shell /usr/xpg4/bin/sh. The description of the bug can be found at -## +## ## and the report of the original failure can be found at automake -## bug#10026 +## bug#10026 d2=$$d$$p; \ if test -d "$$d2"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ diff --git a/lib/am/vala.am b/lib/am/vala.am index 836e12e87..f20b00c2c 100644 --- a/lib/am/vala.am +++ b/lib/am/vala.am @@ -12,6 +12,6 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . ## There is no rule here. :-) diff --git a/lib/am/yacc.am b/lib/am/yacc.am index be1bf77a7..28f05d2de 100644 --- a/lib/am/yacc.am +++ b/lib/am/yacc.am @@ -12,7 +12,7 @@ ## GNU General Public License for more details. ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . ## We want to disable the Yacc rebuild rule when ## 1. AM_MAINTAINER_MODE is used, and -- cgit v1.2.1 From 5e202df227d5f99801896995aee52992c119d7c8 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Sat, 23 Sep 2017 12:19:43 +0200 Subject: maint: Make Emacs use 'makefile-automake-mode' * bin/local.mk: Specify mode name in the first line. * contrib/t/local.mk: Likewise. * doc/local.mk: Likewise. * lib/Automake/local.mk: Likewise. * lib/am/local.mk: Likewise. * lib/local.mk: Likewise. * m4/local.mk: Likewise. * t/local.mk: Likewise. --- lib/am/local.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/am') diff --git a/lib/am/local.mk b/lib/am/local.mk index 3c2d9ba39..4a38b7433 100644 --- a/lib/am/local.mk +++ b/lib/am/local.mk @@ -1,5 +1,4 @@ -## Included by top-level Makefile for Automake. - +## -*- makefile-automake -*- ## Copyright (C) 1995-2017 Free Software Foundation, Inc. ## ## This program is free software; you can redistribute it and/or modify -- cgit v1.2.1 From ac47c22e3c0c8b055cdd47ccd18621c56f807b37 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 20 Mar 2014 12:31:32 -0700 Subject: "make dist" did not depend on $(BUILT_SOURCES) * lib/am/distdir.am (distdir-am): New intermediate target. Interpose this target between $(distdir) and its dependency on $(DISTFILES), so that we can ensure $(BUILT_SOURCES) are all created before we begin creating $(DISTFILES). * t/dist-vs-built-sources.sh: Test for this. * t/list-of-tests.mk (handwritten_TESTS): Add it. * NEWS (Bugs fixed): Mention it. Assaf Gordon reported that "make dist" (after ./configure from a pristine clone of GNU hello) would fail due to the absence of configmake.h while compiling lib/localcharset.c. https://lists.gnu.org/r/bug-hello/2014-03/msg00016.html --- lib/am/distdir.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/am') diff --git a/lib/am/distdir.am b/lib/am/distdir.am index 653966f0e..4b6543591 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -72,10 +72,13 @@ endif %?SUBDIRS% .PHONY: distdir if %?SUBDIRS% -AM_RECURSIVE_TARGETS += distdir +AM_RECURSIVE_TARGETS += distdir distdir-am endif %?SUBDIRS% -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) ## ## For Gnits users, this is pretty handy. Look at 15 lines ## in case some explanatory text is desirable. -- cgit v1.2.1 From 3f8a2dd54edab7d30fa4b218f42ea36d7f36560e Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 22 Nov 2017 21:07:29 -0800 Subject: port elisp-compilation support to emacs-23.1 and newer In May of 2017, emacs.master support for using the long-deprecated byte-compile-dest-file function was removed, and that removal broke automake's elisp-compiling rule for any .el file not in the current directory. In emacs-23.1 (July 2009) byte-compile-dest-file-function became the recommended way to adjust the byte-compiler's destination. The removed functionality has been restored for Emacs-26, albeit with dissuasive diagnostics warning about the imminent removal of this functionality. It will be removed in Emacs-27. * lib/am/lisp.am (.el.elc): Use byte-compile-dest-file-function, rather than byte-compile-dest-file. Also, use "-f batch-byte-compile '$<'" rather than open-coding it, as suggested by Glenn Morris. * t/lisp-readonly-srcdir.sh: New file, to test for the above. * t/list-of-tests.mk (handwritten_TESTS): Add it. * NEWS (Bugs fixed): Mention this problem. --- lib/am/lisp.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/am') diff --git a/lib/am/lisp.am b/lib/am/lisp.am index 881bf3457..91a0e0516 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -30,7 +30,7 @@ endif %?INSTALL% ## The destination file is normally determined by appending "c" to the ## input (which would erronously put it in $(srcdir) in VPATH builds), ## so we override that, too. - if test "$(EMACS)" != "no"; then \ + if test '$(EMACS)' != no; then \ am__dir=. am__subdir_includes=''; \ case $@ in */*) \ am__dir=`echo '$@' | sed 's,/[^/]*$$,,'`; \ @@ -41,8 +41,8 @@ endif %?INSTALL% $(EMACS) --batch \ $(AM_ELCFLAGS) $(ELCFLAGS) \ $$am__subdir_includes -L $(builddir) -L $(srcdir) \ - --eval "(defun byte-compile-dest-file (f) \"$@\")" \ - --eval "(unless (byte-compile-file \"$<\") (kill-emacs 1))"; \ + --eval '(setq byte-compile-dest-file-function (lambda (_) "$@"))' \ + -f batch-byte-compile '$<'; \ else :; fi -- cgit v1.2.1 From bbaa4cdcd310aef4ae8190e19bf46a27689284b6 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Thu, 4 Jan 2018 16:19:30 +0100 Subject: maint: Update copyright years to 2018 This update has been made with 'make update-copyright'. --- lib/am/check.am | 2 +- lib/am/check2.am | 2 +- lib/am/clean-hdr.am | 2 +- lib/am/clean.am | 2 +- lib/am/compile.am | 2 +- lib/am/configure.am | 2 +- lib/am/data.am | 2 +- lib/am/dejagnu.am | 2 +- lib/am/depend.am | 2 +- lib/am/depend2.am | 2 +- lib/am/distdir.am | 2 +- lib/am/footer.am | 2 +- lib/am/header-vars.am | 2 +- lib/am/header.am | 2 +- lib/am/inst-vars.am | 2 +- lib/am/install.am | 2 +- lib/am/java.am | 2 +- lib/am/lang-compile.am | 2 +- lib/am/lex.am | 2 +- lib/am/library.am | 2 +- lib/am/libs.am | 2 +- lib/am/libtool.am | 2 +- lib/am/lisp.am | 2 +- lib/am/local.mk | 2 +- lib/am/ltlib.am | 2 +- lib/am/ltlibrary.am | 2 +- lib/am/mans-vars.am | 2 +- lib/am/mans.am | 2 +- lib/am/program.am | 2 +- lib/am/progs.am | 2 +- lib/am/python.am | 2 +- lib/am/remake-hdr.am | 2 +- lib/am/scripts.am | 2 +- lib/am/subdirs.am | 2 +- lib/am/tags.am | 2 +- lib/am/texi-vers.am | 2 +- lib/am/texibuild.am | 2 +- lib/am/texinfos.am | 2 +- lib/am/vala.am | 2 +- lib/am/yacc.am | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) (limited to 'lib/am') diff --git a/lib/am/check.am b/lib/am/check.am index 9b05fc2c4..e0db65117 100644 --- a/lib/am/check.am +++ b/lib/am/check.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2001-2017 Free Software Foundation, Inc. +## Copyright (C) 2001-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/check2.am b/lib/am/check2.am index fbf4c7786..982cdb27d 100644 --- a/lib/am/check2.am +++ b/lib/am/check2.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2008-2017 Free Software Foundation, Inc. +## Copyright (C) 2008-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/clean-hdr.am b/lib/am/clean-hdr.am index 1de69a28b..8107a51c3 100644 --- a/lib/am/clean-hdr.am +++ b/lib/am/clean-hdr.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/clean.am b/lib/am/clean.am index e4a7fdb25..026d30c86 100644 --- a/lib/am/clean.am +++ b/lib/am/clean.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/compile.am b/lib/am/compile.am index c92e72d4f..28f77f26e 100644 --- a/lib/am/compile.am +++ b/lib/am/compile.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/configure.am b/lib/am/configure.am index 6f0c50883..d04b085f8 100644 --- a/lib/am/configure.am +++ b/lib/am/configure.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2001-2017 Free Software Foundation, Inc. +## Copyright (C) 2001-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/data.am b/lib/am/data.am index 34b582f46..3b40dfd16 100644 --- a/lib/am/data.am +++ b/lib/am/data.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am index 4aa8f9cc2..88bc88995 100644 --- a/lib/am/dejagnu.am +++ b/lib/am/dejagnu.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/depend.am b/lib/am/depend.am index 1538036c5..a13939c36 100644 --- a/lib/am/depend.am +++ b/lib/am/depend.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/depend2.am b/lib/am/depend2.am index 45dd88c5e..0ef94c468 100644 --- a/lib/am/depend2.am +++ b/lib/am/depend2.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/distdir.am b/lib/am/distdir.am index 4b6543591..47974922f 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2001-2017 Free Software Foundation, Inc. +## Copyright (C) 2001-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/footer.am b/lib/am/footer.am index 7291df1c8..17fe95b85 100644 --- a/lib/am/footer.am +++ b/lib/am/footer.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index 10066b397..a21483024 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/header.am b/lib/am/header.am index d4dba1285..81fe5d272 100644 --- a/lib/am/header.am +++ b/lib/am/header.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/inst-vars.am b/lib/am/inst-vars.am index 2f2824522..0b01243d3 100644 --- a/lib/am/inst-vars.am +++ b/lib/am/inst-vars.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2004-2017 Free Software Foundation, Inc. +## Copyright (C) 2004-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/install.am b/lib/am/install.am index 6ba28e732..45f0defe2 100644 --- a/lib/am/install.am +++ b/lib/am/install.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2001-2017 Free Software Foundation, Inc. +## Copyright (C) 2001-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/java.am b/lib/am/java.am index 4f78e533d..9dc7ac1f5 100644 --- a/lib/am/java.am +++ b/lib/am/java.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1998-2017 Free Software Foundation, Inc. +## Copyright (C) 1998-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/lang-compile.am b/lib/am/lang-compile.am index b6c5434b5..e29c8abaf 100644 --- a/lib/am/lang-compile.am +++ b/lib/am/lang-compile.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2001-2017 Free Software Foundation, Inc. +## Copyright (C) 2001-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/lex.am b/lib/am/lex.am index b57bc5c90..926394a97 100644 --- a/lib/am/lex.am +++ b/lib/am/lex.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2001-2017 Free Software Foundation, Inc. +## Copyright (C) 2001-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/library.am b/lib/am/library.am index 19a7f1a01..de149bbc8 100644 --- a/lib/am/library.am +++ b/lib/am/library.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/libs.am b/lib/am/libs.am index 377fdc552..0ff000fc8 100644 --- a/lib/am/libs.am +++ b/lib/am/libs.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/libtool.am b/lib/am/libtool.am index 9b882d918..7d3fd0a9e 100644 --- a/lib/am/libtool.am +++ b/lib/am/libtool.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/lisp.am b/lib/am/lisp.am index 91a0e0516..ae1f50da5 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1996-2017 Free Software Foundation, Inc. +## Copyright (C) 1996-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/local.mk b/lib/am/local.mk index 4a38b7433..5332176d3 100644 --- a/lib/am/local.mk +++ b/lib/am/local.mk @@ -1,5 +1,5 @@ ## -*- makefile-automake -*- -## Copyright (C) 1995-2017 Free Software Foundation, Inc. +## Copyright (C) 1995-2018 Free Software Foundation, Inc. ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am index b99f0bf0a..1cbf7192e 100644 --- a/lib/am/ltlib.am +++ b/lib/am/ltlib.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/ltlibrary.am b/lib/am/ltlibrary.am index a7a2c380b..d6dde9c23 100644 --- a/lib/am/ltlibrary.am +++ b/lib/am/ltlibrary.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/mans-vars.am b/lib/am/mans-vars.am index 3b0f49dff..c189cd812 100644 --- a/lib/am/mans-vars.am +++ b/lib/am/mans-vars.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/mans.am b/lib/am/mans.am index 59d9dd4a2..04879f3b1 100644 --- a/lib/am/mans.am +++ b/lib/am/mans.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1998-2017 Free Software Foundation, Inc. +## Copyright (C) 1998-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/program.am b/lib/am/program.am index d2fe0e0a5..e7a6ac021 100644 --- a/lib/am/program.am +++ b/lib/am/program.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/progs.am b/lib/am/progs.am index cbea73012..3eb506792 100644 --- a/lib/am/progs.am +++ b/lib/am/progs.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/python.am b/lib/am/python.am index 5c438d51d..e29ecfcd0 100644 --- a/lib/am/python.am +++ b/lib/am/python.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1999-2017 Free Software Foundation, Inc. +## Copyright (C) 1999-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am index 52510abdc..041fab5b3 100644 --- a/lib/am/remake-hdr.am +++ b/lib/am/remake-hdr.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/scripts.am b/lib/am/scripts.am index 6a9a23e56..107b2aef9 100644 --- a/lib/am/scripts.am +++ b/lib/am/scripts.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am index db681ba73..039b8adb2 100644 --- a/lib/am/subdirs.am +++ b/lib/am/subdirs.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/tags.am b/lib/am/tags.am index 151402e23..cf850ea56 100644 --- a/lib/am/tags.am +++ b/lib/am/tags.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am index 841f7d7cb..5fc1202e3 100644 --- a/lib/am/texi-vers.am +++ b/lib/am/texi-vers.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am index e2d1b669f..388cee784 100644 --- a/lib/am/texibuild.am +++ b/lib/am/texibuild.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index a2a21e667..70b2f779f 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -1,6 +1,6 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2017 Free Software Foundation, Inc. +## Copyright (C) 1994-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/vala.am b/lib/am/vala.am index f20b00c2c..cea766303 100644 --- a/lib/am/vala.am +++ b/lib/am/vala.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2008-2017 Free Software Foundation, Inc. +## Copyright (C) 2008-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/lib/am/yacc.am b/lib/am/yacc.am index 28f05d2de..1803c246a 100644 --- a/lib/am/yacc.am +++ b/lib/am/yacc.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1998-2017 Free Software Foundation, Inc. +## Copyright (C) 1998-2018 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by -- cgit v1.2.1 From 006c4dfede96091f5bed622c17946cbec067347f Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Sun, 4 Feb 2018 00:09:31 +0100 Subject: python: Avoid exceeding command-line length limit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With Python implementations following PEP-3174, a large number of files are installed in the ‘__pycache__’ directory. As a consequence “t/instmany-python.sh” test was failing due to the ‘uninstall-pythonPYTHON’ target deleting installed files in a single ‘rm’ command. Doing that in multiple steps avoids exceeding the command-line length limit. This fixes bug#30335. * lib/am/python.am (uninstall-%DIR%PYTHON): For byte-compiled files installed in '__pycache__' directory, uninstall them by batch of 40. [?FIRST?] (am__pep3147_tweak): Adapt. --- lib/am/python.am | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'lib/am') diff --git a/lib/am/python.am b/lib/am/python.am index e29ecfcd0..21e6f842c 100644 --- a/lib/am/python.am +++ b/lib/am/python.am @@ -97,7 +97,7 @@ endif %?INSTALL% if %?INSTALL% ?FIRST?am__pep3147_tweak = \ -?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|' +?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|' .PHONY uninstall-am: uninstall-%DIR%PYTHON uninstall-%DIR%PYTHON: @@ -108,26 +108,19 @@ uninstall-%DIR%PYTHON: test -n "$$py_files" || exit 0; \ dir='$(DESTDIR)$(%NDIR%dir)'; \ ## Also remove the .pyc and .pyo byte compiled versions. -## This is somewhat tricky, because for newer pythons we have to take -## PEP-3147 into account. pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \ pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \ - py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \ - echo "$$py_files_pep3147";\ - pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \ - pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \ st=0; \ - for files in \ - "$$py_files" \ - "$$pyc_files" \ - "$$pyo_files" \ -## Installation of '.py' files is not influenced by PEP-3147, so it -## is correct *not* to have $pyfiles_pep3147 here. - "$$pyc_files_pep3147" \ - "$$pyo_files_pep3147" \ - ; do \ + for files in "$$py_files" "$$pyc_files" "$$pyo_files"; do \ $(am__uninstall_files_from_dir) || st=$$?; \ done; \ +## This is somewhat tricky, because for newer pythons we have to take PEP-3147 +## into account. Avoid exceeding the command-line length limit. + dir='$(DESTDIR)$(%NDIR%dir)/__pycache__'; \ + echo "$$py_files" | $(am__pep3147_tweak) | $(am__base_list) | \ + while read files; do \ + $(am__uninstall_files_from_dir) || st=$$?; \ + done || exit $$?; \ exit $$st endif %?INSTALL% -- cgit v1.2.1