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. --- Makefile.am | 14 +-- bin/Makefile.inc | 82 -------------- bin/local.mk | 82 ++++++++++++++ contrib/t/Makefile.inc | 26 ----- contrib/t/local.mk | 26 +++++ doc/Makefile.inc | 115 -------------------- doc/local.mk | 115 ++++++++++++++++++++ lib/Automake/Makefile.inc | 57 ---------- lib/Automake/local.mk | 57 ++++++++++ lib/Makefile.inc | 67 ------------ lib/am/Makefile.inc | 65 ----------- lib/am/local.mk | 65 +++++++++++ lib/local.mk | 67 ++++++++++++ m4/Makefile.inc | 79 -------------- m4/local.mk | 79 ++++++++++++++ t/Makefile.inc | 268 ---------------------------------------------- t/local.mk | 268 ++++++++++++++++++++++++++++++++++++++++++++++ 17 files changed, 766 insertions(+), 766 deletions(-) delete mode 100644 bin/Makefile.inc create mode 100644 bin/local.mk delete mode 100644 contrib/t/Makefile.inc create mode 100644 contrib/t/local.mk delete mode 100644 doc/Makefile.inc create mode 100644 doc/local.mk delete mode 100644 lib/Automake/Makefile.inc create mode 100644 lib/Automake/local.mk delete mode 100644 lib/Makefile.inc delete mode 100644 lib/am/Makefile.inc create mode 100644 lib/am/local.mk create mode 100644 lib/local.mk delete mode 100644 m4/Makefile.inc create mode 100644 m4/local.mk delete mode 100644 t/Makefile.inc create mode 100644 t/local.mk diff --git a/Makefile.am b/Makefile.am index ab6533ea9..89de362de 100644 --- a/Makefile.am +++ b/Makefile.am @@ -123,12 +123,12 @@ EXTRA_DIST += \ maintainer/syntax-checks.mk # Most work delegated to sub-dir makefile fragments. -include $(srcdir)/bin/Makefile.inc -include $(srcdir)/doc/Makefile.inc -include $(srcdir)/lib/Makefile.inc -include $(srcdir)/lib/Automake/Makefile.inc -include $(srcdir)/lib/am/Makefile.inc -include $(srcdir)/m4/Makefile.inc -include $(srcdir)/t/Makefile.inc +include $(srcdir)/bin/local.mk +include $(srcdir)/doc/local.mk +include $(srcdir)/lib/local.mk +include $(srcdir)/lib/Automake/local.mk +include $(srcdir)/lib/am/local.mk +include $(srcdir)/m4/local.mk +include $(srcdir)/t/local.mk # vim: ft=automake noet diff --git a/bin/Makefile.inc b/bin/Makefile.inc deleted file mode 100644 index c63f670b8..000000000 --- a/bin/Makefile.inc +++ /dev/null @@ -1,82 +0,0 @@ -## 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 . - -## ----------------------------------- ## -## The automake and aclocal scripts. ## -## ----------------------------------- ## - -bin_SCRIPTS = %D%/automake %D%/aclocal -nodist_noinst_SCRIPTS += \ - %D%/aclocal-$(APIVERSION) \ - %D%/automake-$(APIVERSION) - -CLEANFILES += \ - $(bin_SCRIPTS) \ - %D%/aclocal-$(APIVERSION) \ - %D%/automake-$(APIVERSION) - -# Used by maintainer checks and such. -automake_in = $(srcdir)/%D%/automake.in -aclocal_in = $(srcdir)/%D%/aclocal.in -automake_script = %D%/automake -aclocal_script = %D%/aclocal - -AUTOMAKESOURCES = $(automake_in) $(aclocal_in) -TAGS_FILES += $(AUTOMAKESOURCES) -EXTRA_DIST += $(AUTOMAKESOURCES) - -# Make versioned links. We only run the transform on the root name; -# then we make a versioned link with the transformed base name. This -# seemed like the most reasonable approach. -install-exec-hook: - @$(POST_INSTALL) - @for p in $(bin_SCRIPTS); do \ - f=`echo $$p | sed -e 's,.*/,,' -e '$(transform)'`; \ - fv="$$f-$(APIVERSION)"; \ - rm -f "$(DESTDIR)$(bindir)/$$fv"; \ - echo " $(LN) '$(DESTDIR)$(bindir)/$$f' '$(DESTDIR)$(bindir)/$$fv'"; \ - $(LN) "$(DESTDIR)$(bindir)/$$f" "$(DESTDIR)$(bindir)/$$fv"; \ - done - -uninstall-hook: - @for p in $(bin_SCRIPTS); do \ - f=`echo $$p | sed -e 's,.*/,,' -e '$(transform)'`; \ - fv="$$f-$(APIVERSION)"; \ - rm -f "$(DESTDIR)$(bindir)/$$fv"; \ - done - -# These files depend on Makefile so they are rebuilt if $(VERSION), -# $(datadir) or other do_subst'ituted variables change. -%D%/automake: %D%/automake.in -%D%/aclocal: %D%/aclocal.in -%D%/automake %D%/aclocal: Makefile - $(AM_V_GEN)rm -f $@ $@-t $@-t2 \ - && $(MKDIR_P) $(@D) \ -## Common substitutions. - && in=$@.in && $(do_subst) <$(srcdir)/$$in >$@-t \ -## We can't use '$(generated_file_finalize)' here, because currently -## Automake contains occurrences of unexpanded @substitutions@ in -## comments, and that is perfectly legit. - && chmod a+x,a-w $@-t && mv -f $@-t $@ - -%D%/aclocal-$(APIVERSION): %D%/aclocal - $(AM_V_GEN) rm -f $@; \ - $(LN) %D%/aclocal $@ - -%D%/automake-$(APIVERSION): %D%/automake - $(AM_V_GEN) rm -f $@; \ - $(LN) %D%/automake $@ - -# vim: ft=automake noet diff --git a/bin/local.mk b/bin/local.mk new file mode 100644 index 000000000..c63f670b8 --- /dev/null +++ b/bin/local.mk @@ -0,0 +1,82 @@ +## 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 . + +## ----------------------------------- ## +## The automake and aclocal scripts. ## +## ----------------------------------- ## + +bin_SCRIPTS = %D%/automake %D%/aclocal +nodist_noinst_SCRIPTS += \ + %D%/aclocal-$(APIVERSION) \ + %D%/automake-$(APIVERSION) + +CLEANFILES += \ + $(bin_SCRIPTS) \ + %D%/aclocal-$(APIVERSION) \ + %D%/automake-$(APIVERSION) + +# Used by maintainer checks and such. +automake_in = $(srcdir)/%D%/automake.in +aclocal_in = $(srcdir)/%D%/aclocal.in +automake_script = %D%/automake +aclocal_script = %D%/aclocal + +AUTOMAKESOURCES = $(automake_in) $(aclocal_in) +TAGS_FILES += $(AUTOMAKESOURCES) +EXTRA_DIST += $(AUTOMAKESOURCES) + +# Make versioned links. We only run the transform on the root name; +# then we make a versioned link with the transformed base name. This +# seemed like the most reasonable approach. +install-exec-hook: + @$(POST_INSTALL) + @for p in $(bin_SCRIPTS); do \ + f=`echo $$p | sed -e 's,.*/,,' -e '$(transform)'`; \ + fv="$$f-$(APIVERSION)"; \ + rm -f "$(DESTDIR)$(bindir)/$$fv"; \ + echo " $(LN) '$(DESTDIR)$(bindir)/$$f' '$(DESTDIR)$(bindir)/$$fv'"; \ + $(LN) "$(DESTDIR)$(bindir)/$$f" "$(DESTDIR)$(bindir)/$$fv"; \ + done + +uninstall-hook: + @for p in $(bin_SCRIPTS); do \ + f=`echo $$p | sed -e 's,.*/,,' -e '$(transform)'`; \ + fv="$$f-$(APIVERSION)"; \ + rm -f "$(DESTDIR)$(bindir)/$$fv"; \ + done + +# These files depend on Makefile so they are rebuilt if $(VERSION), +# $(datadir) or other do_subst'ituted variables change. +%D%/automake: %D%/automake.in +%D%/aclocal: %D%/aclocal.in +%D%/automake %D%/aclocal: Makefile + $(AM_V_GEN)rm -f $@ $@-t $@-t2 \ + && $(MKDIR_P) $(@D) \ +## Common substitutions. + && in=$@.in && $(do_subst) <$(srcdir)/$$in >$@-t \ +## We can't use '$(generated_file_finalize)' here, because currently +## Automake contains occurrences of unexpanded @substitutions@ in +## comments, and that is perfectly legit. + && chmod a+x,a-w $@-t && mv -f $@-t $@ + +%D%/aclocal-$(APIVERSION): %D%/aclocal + $(AM_V_GEN) rm -f $@; \ + $(LN) %D%/aclocal $@ + +%D%/automake-$(APIVERSION): %D%/automake + $(AM_V_GEN) rm -f $@; \ + $(LN) %D%/automake $@ + +# vim: ft=automake noet diff --git a/contrib/t/Makefile.inc b/contrib/t/Makefile.inc deleted file mode 100644 index d55fb9583..000000000 --- a/contrib/t/Makefile.inc +++ /dev/null @@ -1,26 +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 . - -## -------------------------------- ## -## Tests for stuff in 'contrib/'. ## -## -------------------------------- ## - -contrib_TESTS = \ - %D%/parallel-tests-html.sh \ - %D%/parallel-tests-html-recursive.sh \ - %D%/help-multilib.sh \ - %D%/multilib.sh diff --git a/contrib/t/local.mk b/contrib/t/local.mk new file mode 100644 index 000000000..d55fb9583 --- /dev/null +++ b/contrib/t/local.mk @@ -0,0 +1,26 @@ +## 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 . + +## -------------------------------- ## +## Tests for stuff in 'contrib/'. ## +## -------------------------------- ## + +contrib_TESTS = \ + %D%/parallel-tests-html.sh \ + %D%/parallel-tests-html-recursive.sh \ + %D%/help-multilib.sh \ + %D%/multilib.sh diff --git a/doc/Makefile.inc b/doc/Makefile.inc deleted file mode 100644 index 807c29308..000000000 --- a/doc/Makefile.inc +++ /dev/null @@ -1,115 +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 . - -## ---------------- ## -## Documentation. ## -## ---------------- ## - -info_TEXINFOS = %D%/automake.texi %D%/automake-history.texi -doc_automake_TEXINFOS = %D%/fdl.texi -doc_automake_history_TEXINFOS = %D%/fdl.texi - -man1_MANS = \ - %D%/aclocal.1 \ - %D%/automake.1 \ - %D%/aclocal-$(APIVERSION).1 \ - %D%/automake-$(APIVERSION).1 - -$(man1_MANS): $(top_srcdir)/configure.ac - -CLEANFILES += $(man1_MANS) -# XXX: This script should be updated with 'fetch' target. -EXTRA_DIST += %D%/help2man - -update_mans = \ - $(AM_V_GEN): \ - && $(MKDIR_P) %D% \ - && ./pre-inst-env $(PERL) $(srcdir)/%D%/help2man --output=$@ - -%D%/aclocal.1 %D%/automake.1: - $(AM_V_GEN): \ - && $(MKDIR_P) %D% \ - && f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'` \ - && echo ".so man1/$$f-$(APIVERSION).1" > $@ - -%D%/aclocal-$(APIVERSION).1: $(aclocal_script) lib/Automake/Config.pm - $(update_mans) aclocal-$(APIVERSION) -%D%/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm - $(update_mans) automake-$(APIVERSION) - -## ---------------------------- ## -## Example package "amhello". ## -## ---------------------------- ## - -amhello_sources = \ - %D%/amhello/configure.ac \ - %D%/amhello/Makefile.am \ - %D%/amhello/README \ - %D%/amhello/src/main.c \ - %D%/amhello/src/Makefile.am - -amhello_configury = \ - aclocal.m4 \ - autom4te.cache \ - Makefile.in \ - config.h.in \ - configure \ - depcomp \ - install-sh \ - missing \ - src/Makefile.in - -dist_noinst_DATA += $(amhello_sources) -dist_doc_DATA = $(srcdir)/%D%/amhello-1.0.tar.gz - -setup_autotools_paths = { \ - ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL \ - && AUTOMAKE=automake-$(APIVERSION) && export AUTOMAKE \ - && AUTOCONF='$(am_AUTOCONF)' && export AUTOCONF \ - && AUTOM4TE='$(am_AUTOM4TE)' && export AUTOM4TE \ - && AUTORECONF='$(am_AUTORECONF)' && export AUTORECONF \ - && AUTOHEADER='$(am_AUTOHEADER)' && export AUTOHEADER \ - && AUTOUPDATE='$(am_AUTOUPDATE)' && export AUTOUPDATE \ - && true; \ -} - -# We depend on configure.ac so that we regenerate the tarball -# whenever the Automake version changes. -$(srcdir)/%D%/amhello-1.0.tar.gz: $(amhello_sources) $(srcdir)/configure.ac - $(AM_V_GEN)tmp=amhello-output.tmp \ - && $(am__cd) $(srcdir)/%D%/amhello \ - && : Make our aclocal and automake avaiable before system ones. \ - && $(setup_autotools_paths) \ - && ( \ - { $(AM_V_P) || exec 5>&2 >$$tmp 2>&1; } \ - && $(abs_builddir)/pre-inst-env $(am_AUTORECONF) -vfi \ - && ./configure \ - && $(MAKE) $(AM_MAKEFLAGS) distcheck \ - && $(MAKE) $(AM_MAKEFLAGS) distclean \ - || { \ - if $(AM_V_P); then :; else \ - echo "$@: recipe failed." >&5; \ - echo "See file '`pwd`/$$tmp' for details" >&5; \ - fi; \ - exit 1; \ - } \ - ) \ - && rm -rf $(amhello_configury) $$tmp \ - && mv -f amhello-1.0.tar.gz .. - - -# vim: ft=automake noet diff --git a/doc/local.mk b/doc/local.mk new file mode 100644 index 000000000..807c29308 --- /dev/null +++ b/doc/local.mk @@ -0,0 +1,115 @@ +## 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 . + +## ---------------- ## +## Documentation. ## +## ---------------- ## + +info_TEXINFOS = %D%/automake.texi %D%/automake-history.texi +doc_automake_TEXINFOS = %D%/fdl.texi +doc_automake_history_TEXINFOS = %D%/fdl.texi + +man1_MANS = \ + %D%/aclocal.1 \ + %D%/automake.1 \ + %D%/aclocal-$(APIVERSION).1 \ + %D%/automake-$(APIVERSION).1 + +$(man1_MANS): $(top_srcdir)/configure.ac + +CLEANFILES += $(man1_MANS) +# XXX: This script should be updated with 'fetch' target. +EXTRA_DIST += %D%/help2man + +update_mans = \ + $(AM_V_GEN): \ + && $(MKDIR_P) %D% \ + && ./pre-inst-env $(PERL) $(srcdir)/%D%/help2man --output=$@ + +%D%/aclocal.1 %D%/automake.1: + $(AM_V_GEN): \ + && $(MKDIR_P) %D% \ + && f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'` \ + && echo ".so man1/$$f-$(APIVERSION).1" > $@ + +%D%/aclocal-$(APIVERSION).1: $(aclocal_script) lib/Automake/Config.pm + $(update_mans) aclocal-$(APIVERSION) +%D%/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm + $(update_mans) automake-$(APIVERSION) + +## ---------------------------- ## +## Example package "amhello". ## +## ---------------------------- ## + +amhello_sources = \ + %D%/amhello/configure.ac \ + %D%/amhello/Makefile.am \ + %D%/amhello/README \ + %D%/amhello/src/main.c \ + %D%/amhello/src/Makefile.am + +amhello_configury = \ + aclocal.m4 \ + autom4te.cache \ + Makefile.in \ + config.h.in \ + configure \ + depcomp \ + install-sh \ + missing \ + src/Makefile.in + +dist_noinst_DATA += $(amhello_sources) +dist_doc_DATA = $(srcdir)/%D%/amhello-1.0.tar.gz + +setup_autotools_paths = { \ + ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL \ + && AUTOMAKE=automake-$(APIVERSION) && export AUTOMAKE \ + && AUTOCONF='$(am_AUTOCONF)' && export AUTOCONF \ + && AUTOM4TE='$(am_AUTOM4TE)' && export AUTOM4TE \ + && AUTORECONF='$(am_AUTORECONF)' && export AUTORECONF \ + && AUTOHEADER='$(am_AUTOHEADER)' && export AUTOHEADER \ + && AUTOUPDATE='$(am_AUTOUPDATE)' && export AUTOUPDATE \ + && true; \ +} + +# We depend on configure.ac so that we regenerate the tarball +# whenever the Automake version changes. +$(srcdir)/%D%/amhello-1.0.tar.gz: $(amhello_sources) $(srcdir)/configure.ac + $(AM_V_GEN)tmp=amhello-output.tmp \ + && $(am__cd) $(srcdir)/%D%/amhello \ + && : Make our aclocal and automake avaiable before system ones. \ + && $(setup_autotools_paths) \ + && ( \ + { $(AM_V_P) || exec 5>&2 >$$tmp 2>&1; } \ + && $(abs_builddir)/pre-inst-env $(am_AUTORECONF) -vfi \ + && ./configure \ + && $(MAKE) $(AM_MAKEFLAGS) distcheck \ + && $(MAKE) $(AM_MAKEFLAGS) distclean \ + || { \ + if $(AM_V_P); then :; else \ + echo "$@: recipe failed." >&5; \ + echo "See file '`pwd`/$$tmp' for details" >&5; \ + fi; \ + exit 1; \ + } \ + ) \ + && rm -rf $(amhello_configury) $$tmp \ + && mv -f amhello-1.0.tar.gz .. + + +# vim: ft=automake noet diff --git a/lib/Automake/Makefile.inc b/lib/Automake/Makefile.inc deleted file mode 100644 index c0d8a4729..000000000 --- a/lib/Automake/Makefile.inc +++ /dev/null @@ -1,57 +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 . - -## ---------------------------------------------------- ## -## Private perl modules used by automake and aclocal. ## -## ---------------------------------------------------- ## - -perllibdir = $(pkgvdatadir)/Automake - -dist_perllib_DATA = \ - %D%/ChannelDefs.pm \ - %D%/Channels.pm \ - %D%/Condition.pm \ - %D%/Configure_ac.pm \ - %D%/DisjConditions.pm \ - %D%/FileUtils.pm \ - %D%/General.pm \ - %D%/Getopt.pm \ - %D%/Item.pm \ - %D%/ItemDef.pm \ - %D%/Language.pm \ - %D%/Location.pm \ - %D%/Options.pm \ - %D%/Rule.pm \ - %D%/RuleDef.pm \ - %D%/Variable.pm \ - %D%/VarDef.pm \ - %D%/Version.pm \ - %D%/XFile.pm \ - %D%/Wrap.pm - -nodist_perllib_DATA = %D%/Config.pm -CLEANFILES += $(nodist_perllib_DATA) - -%D%/Config.pm: %D%/Config.in Makefile - $(AM_V_at)rm -f $@ $@-t - $(AM_V_at)$(MKDIR_P) %D% - $(AM_V_GEN)in=Config.in \ - && $(do_subst) <$(srcdir)/%D%/Config.in >$@-t - $(generated_file_finalize) -EXTRA_DIST += %D%/Config.in - -# vim: ft=automake noet diff --git a/lib/Automake/local.mk b/lib/Automake/local.mk new file mode 100644 index 000000000..c0d8a4729 --- /dev/null +++ b/lib/Automake/local.mk @@ -0,0 +1,57 @@ +## 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 . + +## ---------------------------------------------------- ## +## Private perl modules used by automake and aclocal. ## +## ---------------------------------------------------- ## + +perllibdir = $(pkgvdatadir)/Automake + +dist_perllib_DATA = \ + %D%/ChannelDefs.pm \ + %D%/Channels.pm \ + %D%/Condition.pm \ + %D%/Configure_ac.pm \ + %D%/DisjConditions.pm \ + %D%/FileUtils.pm \ + %D%/General.pm \ + %D%/Getopt.pm \ + %D%/Item.pm \ + %D%/ItemDef.pm \ + %D%/Language.pm \ + %D%/Location.pm \ + %D%/Options.pm \ + %D%/Rule.pm \ + %D%/RuleDef.pm \ + %D%/Variable.pm \ + %D%/VarDef.pm \ + %D%/Version.pm \ + %D%/XFile.pm \ + %D%/Wrap.pm + +nodist_perllib_DATA = %D%/Config.pm +CLEANFILES += $(nodist_perllib_DATA) + +%D%/Config.pm: %D%/Config.in Makefile + $(AM_V_at)rm -f $@ $@-t + $(AM_V_at)$(MKDIR_P) %D% + $(AM_V_GEN)in=Config.in \ + && $(do_subst) <$(srcdir)/%D%/Config.in >$@-t + $(generated_file_finalize) +EXTRA_DIST += %D%/Config.in + +# vim: ft=automake noet diff --git a/lib/Makefile.inc b/lib/Makefile.inc deleted file mode 100644 index 50035de60..000000000 --- a/lib/Makefile.inc +++ /dev/null @@ -1,67 +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 . - -## -------------------------------------------------------------------- ## -## Auxiliary scripts and files for use with "automake --add-missing". ## -## -------------------------------------------------------------------- ## - -dist_pkgvdata_DATA = \ - %D%/COPYING \ - %D%/INSTALL \ - %D%/texinfo.tex - -# These must all be executable when installed. However, if we use -# _SCRIPTS, then the program transform will be applied, which is not -# what we want. So we make them executable by hand. -dist_script_DATA = \ - %D%/config.guess \ - %D%/config.sub \ - %D%/install-sh \ - %D%/mdate-sh \ - %D%/missing \ - %D%/mkinstalldirs \ - %D%/ylwrap \ - %D%/depcomp \ - %D%/compile \ - %D%/py-compile \ - %D%/ar-lib \ - %D%/test-driver \ - %D%/tap-driver.sh - -install-data-hook: - @$(POST_INSTALL) - @for f in $(dist_script_DATA); do echo $$f; done \ - | sed 's,^%D%/,,' \ - | ( st=0; \ - while read f; do \ - echo " chmod +x '$(DESTDIR)$(scriptdir)/$$f'"; \ - chmod +x "$(DESTDIR)$(scriptdir)/$$f" || st=1; \ - done; \ - exit $$st ) - -installcheck-local: installcheck-executable-scripts -installcheck-executable-scripts: - @for f in $(dist_script_DATA); do echo $$f; done \ - | sed 's,^%D%/,,' \ - | while read f; do \ - path="$(pkgvdatadir)/$$f"; \ - test -x "$$path" || echo $$path; \ - done \ - | sed 's/$$/: not executable/' \ - | grep . 1>&2 && exit 1; exit 0 - -# vim: ft=automake noet 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 diff --git a/lib/local.mk b/lib/local.mk new file mode 100644 index 000000000..50035de60 --- /dev/null +++ b/lib/local.mk @@ -0,0 +1,67 @@ +## 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 . + +## -------------------------------------------------------------------- ## +## Auxiliary scripts and files for use with "automake --add-missing". ## +## -------------------------------------------------------------------- ## + +dist_pkgvdata_DATA = \ + %D%/COPYING \ + %D%/INSTALL \ + %D%/texinfo.tex + +# These must all be executable when installed. However, if we use +# _SCRIPTS, then the program transform will be applied, which is not +# what we want. So we make them executable by hand. +dist_script_DATA = \ + %D%/config.guess \ + %D%/config.sub \ + %D%/install-sh \ + %D%/mdate-sh \ + %D%/missing \ + %D%/mkinstalldirs \ + %D%/ylwrap \ + %D%/depcomp \ + %D%/compile \ + %D%/py-compile \ + %D%/ar-lib \ + %D%/test-driver \ + %D%/tap-driver.sh + +install-data-hook: + @$(POST_INSTALL) + @for f in $(dist_script_DATA); do echo $$f; done \ + | sed 's,^%D%/,,' \ + | ( st=0; \ + while read f; do \ + echo " chmod +x '$(DESTDIR)$(scriptdir)/$$f'"; \ + chmod +x "$(DESTDIR)$(scriptdir)/$$f" || st=1; \ + done; \ + exit $$st ) + +installcheck-local: installcheck-executable-scripts +installcheck-executable-scripts: + @for f in $(dist_script_DATA); do echo $$f; done \ + | sed 's,^%D%/,,' \ + | while read f; do \ + path="$(pkgvdatadir)/$$f"; \ + test -x "$$path" || echo $$path; \ + done \ + | sed 's/$$/: not executable/' \ + | grep . 1>&2 && exit 1; exit 0 + +# vim: ft=automake noet diff --git a/m4/Makefile.inc b/m4/Makefile.inc deleted file mode 100644 index eb5702742..000000000 --- a/m4/Makefile.inc +++ /dev/null @@ -1,79 +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 . - -## ------------------------------ ## -## Automake-provided m4 macros. ## -## ------------------------------ ## - -system_acdir = @system_acdir@ -automake_acdir = @automake_acdir@ - -dist_automake_ac_DATA = \ - %D%/amversion.m4 \ - %D%/ar-lib.m4 \ - %D%/as.m4 \ - %D%/auxdir.m4 \ - %D%/cond.m4 \ - %D%/cond-if.m4 \ - %D%/depend.m4 \ - %D%/depout.m4 \ - %D%/dmalloc.m4 \ - %D%/extra-recurs.m4 \ - %D%/gcj.m4 \ - %D%/init.m4 \ - %D%/install-sh.m4 \ - %D%/lead-dot.m4 \ - %D%/lex.m4 \ - %D%/lispdir.m4 \ - %D%/maintainer.m4 \ - %D%/make.m4 \ - %D%/missing.m4 \ - %D%/mkdirp.m4 \ - %D%/obsolete.m4 \ - %D%/options.m4 \ - %D%/python.m4 \ - %D%/prog-cc-c-o.m4 \ - %D%/runlog.m4 \ - %D%/sanity.m4 \ - %D%/silent.m4 \ - %D%/strip.m4 \ - %D%/substnot.m4 \ - %D%/tar.m4 \ - %D%/upc.m4 \ - %D%/vala.m4 - -dist_system_ac_DATA = %D%/acdir/README - -automake_internal_acdir = $(automake_acdir)/internal -dist_automake_internal_ac_DATA = %D%/internal/ac-config-macro-dirs.m4 - -# We build amversion.m4 here, instead of from config.status, -# because config.status is rerun each time one of configure's -# dependencies change and amversion.m4 happens to be a configure -# dependency. configure and amversion.m4 would be rebuilt in -# loop otherwise. -# Use '$(top_srcdir)' for the benefit of non-GNU makes: this is -# how amversion.m4 appears in our dependencies. -$(top_srcdir)/%D%/amversion.m4: $(srcdir)/configure.ac \ - $(srcdir)/%D%/amversion.in - $(AM_V_at)rm -f $@-t $@ - $(AM_V_GEN)in=amversion.in \ - && $(do_subst) <$(srcdir)/%D%/amversion.in >$@-t - $(generated_file_finalize) -EXTRA_DIST += %D%/amversion.in - -# vim: ft=automake noet diff --git a/m4/local.mk b/m4/local.mk new file mode 100644 index 000000000..eb5702742 --- /dev/null +++ b/m4/local.mk @@ -0,0 +1,79 @@ +## 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 . + +## ------------------------------ ## +## Automake-provided m4 macros. ## +## ------------------------------ ## + +system_acdir = @system_acdir@ +automake_acdir = @automake_acdir@ + +dist_automake_ac_DATA = \ + %D%/amversion.m4 \ + %D%/ar-lib.m4 \ + %D%/as.m4 \ + %D%/auxdir.m4 \ + %D%/cond.m4 \ + %D%/cond-if.m4 \ + %D%/depend.m4 \ + %D%/depout.m4 \ + %D%/dmalloc.m4 \ + %D%/extra-recurs.m4 \ + %D%/gcj.m4 \ + %D%/init.m4 \ + %D%/install-sh.m4 \ + %D%/lead-dot.m4 \ + %D%/lex.m4 \ + %D%/lispdir.m4 \ + %D%/maintainer.m4 \ + %D%/make.m4 \ + %D%/missing.m4 \ + %D%/mkdirp.m4 \ + %D%/obsolete.m4 \ + %D%/options.m4 \ + %D%/python.m4 \ + %D%/prog-cc-c-o.m4 \ + %D%/runlog.m4 \ + %D%/sanity.m4 \ + %D%/silent.m4 \ + %D%/strip.m4 \ + %D%/substnot.m4 \ + %D%/tar.m4 \ + %D%/upc.m4 \ + %D%/vala.m4 + +dist_system_ac_DATA = %D%/acdir/README + +automake_internal_acdir = $(automake_acdir)/internal +dist_automake_internal_ac_DATA = %D%/internal/ac-config-macro-dirs.m4 + +# We build amversion.m4 here, instead of from config.status, +# because config.status is rerun each time one of configure's +# dependencies change and amversion.m4 happens to be a configure +# dependency. configure and amversion.m4 would be rebuilt in +# loop otherwise. +# Use '$(top_srcdir)' for the benefit of non-GNU makes: this is +# how amversion.m4 appears in our dependencies. +$(top_srcdir)/%D%/amversion.m4: $(srcdir)/configure.ac \ + $(srcdir)/%D%/amversion.in + $(AM_V_at)rm -f $@-t $@ + $(AM_V_GEN)in=amversion.in \ + && $(do_subst) <$(srcdir)/%D%/amversion.in >$@-t + $(generated_file_finalize) +EXTRA_DIST += %D%/amversion.in + +# vim: ft=automake noet diff --git a/t/Makefile.inc b/t/Makefile.inc deleted file mode 100644 index 6b3b62fed..000000000 --- a/t/Makefile.inc +++ /dev/null @@ -1,268 +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 . - -## ------------ ## -## Testsuite. ## -## ------------ ## - -# Run the tests with a proper shell detected at configure time. -LOG_COMPILER = ./pre-inst-env $(AM_TEST_RUNNER_SHELL) - -TEST_EXTENSIONS = .pl .sh .tap -SH_LOG_COMPILER = $(LOG_COMPILER) -TAP_LOG_COMPILER = $(LOG_COMPILER) -PL_LOG_COMPILER = ./pre-inst-env $(PERL) -AM_PL_LOG_FLAGS = -Mstrict -w - -TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(srcdir)/lib/tap-driver.sh - -AM_TAP_LOG_DRIVER_FLAGS = --merge - -EXTRA_DIST += %D%/README %D%/ax/is %D%/ax/is_newest %D%/ax/deltree.pl - - -## Will be updated later. -TESTS = - -# Some testsuite-influential variables should be overridable from the -# test scripts, but not from the environment. -# Keep this in sync with the similar list in ax/runtest.in. -AM_TESTS_ENVIRONMENT = \ - for v in \ - required \ - am_test_protocol \ - am_serial_tests \ - am_test_prefer_config_shell \ - am_original_AUTOMAKE \ - am_original_ACLOCAL \ - am_test_lib_sourced \ - test_lib_sourced \ - ; do \ - eval test x"\$${$$v}" = x || unset $$v; \ - done; -# We want warning messages and explanations for skipped tests to go to -# the console if possible, so set up 'stderr_fileno_' properly. -AM_TESTS_FD_REDIRECT = 9>&2 -AM_TESTS_ENVIRONMENT += stderr_fileno_=9; export stderr_fileno_; - -# For sourcing of extra "shell libraries" by our test scripts. As per -# POSIX, sourcing a file with '.' will cause it to be looked up in $PATH -# in case it is given with a relative name containing no slashes. -AM_TESTS_ENVIRONMENT += \ - if test $(srcdir) != .; then \ - PATH='$(abs_srcdir)/%D%/ax$(PATH_SEPARATOR)'$$PATH; \ - fi; \ - PATH='$(abs_builddir)/%D%/ax$(PATH_SEPARATOR)'$$PATH; \ - export PATH; - -# Hand-written tests. - -include $(srcdir)/%D%/list-of-tests.mk - -TESTS += $(handwritten_TESTS) -EXTRA_DIST += $(handwritten_TESTS) - -# Automatically-generated tests wrapping hand-written ones. -# Also, automatically-computed dependencies for tests. - -include $(srcdir)/%D%/testsuite-part.am - -TESTS += $(generated_TESTS) -EXTRA_DIST += $(generated_TESTS) - -$(srcdir)/%D%/testsuite-part.am: - $(AM_V_at)rm -f %D%/testsuite-part.tmp $@ - $(AM_V_GEN)$(PERL) $(srcdir)/gen-testsuite-part \ - --srcdir $(srcdir) > %D%/testsuite-part.tmp - $(AM_V_at)chmod a-w %D%/testsuite-part.tmp - $(AM_V_at)mv -f %D%/testsuite-part.tmp $@ -EXTRA_DIST += gen-testsuite-part - -# The dependecies declared here are not truly complete, but such -# completeness would cause more issues than it would solve. See -# automake bug#11347. -$(generated_TESTS): $(srcdir)/gen-testsuite-part -$(srcdir)/%D%/testsuite-part.am: $(srcdir)/gen-testsuite-part -$(srcdir)/%D%/testsuite-part.am: Makefile.am - -# Hand-written tests for stuff in 'contrib/'. -include $(srcdir)/contrib/%D%/Makefile.inc -TESTS += $(contrib_TESTS) -EXTRA_DIST += $(contrib_TESTS) - -# Static dependencies valid for each test case (also further -# extended later). Note that use 'noinst_' rather than 'check_' -# as the prefix, because we really want them to be built by -# "make all". This makes it easier to run the test cases by -# hand after having simply configured and built the package. - -dist_noinst_DATA += \ - %D%/ax/test-init.sh \ - %D%/ax/test-lib.sh \ - %D%/ax/am-test-lib.sh \ - %D%/ax/tap-functions.sh - -# Few more static dependencies. -%D%/distcheck-missing-m4.log: %D%/ax/distcheck-hook-m4.am -%D%/distcheck-outdated-m4.log: %D%/ax/distcheck-hook-m4.am -EXTRA_DIST += %D%/ax/distcheck-hook-m4.am - -%D%/ax/test-defs.sh: %D%/ax/test-defs.in Makefile - $(AM_V_at)rm -f $@ $@-t - $(AM_V_at)$(MKDIR_P) %D%/ax - $(AM_V_GEN)in=%D%/ax/test-defs.in \ - && $(do_subst) <$(srcdir)/$$in >$@-t - $(generated_file_finalize) -EXTRA_DIST += %D%/ax/test-defs.in -CLEANFILES += %D%/ax/test-defs.sh -nodist_noinst_DATA += %D%/ax/test-defs.sh - -%D%/ax/shell-no-trail-bslash: %D%/ax/shell-no-trail-bslash.in Makefile - $(AM_V_at)rm -f $@ $@-t - $(AM_V_GEN)in=%D%/ax/shell-no-trail-bslash.in \ - && $(MKDIR_P) %D%/ax \ - && $(do_subst) <$(srcdir)/$$in >$@-t \ - && chmod a+x $@-t - $(generated_file_finalize) -EXTRA_DIST += %D%/ax/shell-no-trail-bslash.in -CLEANFILES += %D%/ax/shell-no-trail-bslash -nodist_noinst_SCRIPTS += %D%/ax/shell-no-trail-bslash - -%D%/ax/cc-no-c-o: %D%/ax/cc-no-c-o.in Makefile - $(AM_V_at)rm -f $@ $@-t - $(AM_V_GEN)in=%D%/ax/cc-no-c-o.in \ - && $(MKDIR_P) %D%/ax \ - && $(do_subst) <$(srcdir)/$$in >$@-t \ - && chmod a+x $@-t - $(generated_file_finalize) -EXTRA_DIST += %D%/ax/cc-no-c-o.in -CLEANFILES += %D%/ax/cc-no-c-o -nodist_noinst_SCRIPTS += %D%/ax/cc-no-c-o - -runtest: %D%/ax/runtest.in Makefile - $(AM_V_at)rm -f $@ $@-t - $(AM_V_GEN)in=%D%/ax/runtest.in \ - && $(MKDIR_P) %D%/ax \ - && $(do_subst) <$(srcdir)/$$in >$@-t \ - && chmod a+x $@-t - $(generated_file_finalize) -EXTRA_DIST += %D%/ax/runtest.in -CLEANFILES += runtest -nodist_noinst_SCRIPTS += runtest - -# If two test scripts have the same basename, they will end up sharing -# the same log file, leading to all sort of undefined and undesired -# behaviours. -check-no-repeated-test-name: - @LC_ALL=C; export LC_ALL; \ - lst='$(TEST_LOGS)'; for log in $$lst; do echo $$log; done \ - | sort | uniq -c | awk '($$1 > 1) { print }' \ - | sed 's/\.log$$//' | grep . >&2 \ - && { \ - echo $@: test names listed above are duplicated >&2; \ - exit 1; \ - }; : -check-local: check-no-repeated-test-name -.PHONY: check-no-repeated-test-name - -# Check that our test cases are syntactically correct. -# See automake bug#11898. -check-tests-syntax: - @st=0; \ - err () { echo "$@: $$*" >&2; st=1; }; \ -## The user might do something like "make check TESTS=t/foo" or -## "make check TESTS_LOGS=t/foo.log" and expect (say) the test -## 't/foo.sh' to be run; this has worked well until today, and -## we want to continue supporting this use case. - bases=`for log in : $(TEST_LOGS); do echo $$log; done \ - | sed -e '/^:$$/d' -e 's/\.log$$//'`; \ - for bas in $$bases; do \ - for suf in sh tap pl; do \ - tst=$$bas.$$suf; \ -## Emulate VPATH search. - if test -f $$tst; then \ - break; \ - elif test -f $(srcdir)/$$tst; then \ - tst=$(srcdir)/$$tst; \ - break; \ - else \ - tst=''; \ - fi; \ - done; \ - test -n "$$tst" || err "couldn't find test '$$bas'"; \ -## Don't check that perl tests are valid shell scripts! - test $$suf = pl && continue; \ - $(AM_V_P) && echo " $(AM_TEST_RUNNER_SHELL) -n $$tst"; \ - $(AM_TEST_RUNNER_SHELL) -n "$$tst" \ - || err "test '$$tst' syntactically invalid"; \ - done; \ - exit $$st -check-local: check-tests-syntax -.PHONY: check-tests-syntax - -# Recipes with a trailing backslash character (possibly followed by -# blank characters only) can cause spurious syntax errors with at -# least older bash versions (e.g., bash 2.05b), and can be potentially -# be unportable to other weaker shells. Run the testsuite in a way -# that helps catching such problems in Automake-generated recipes. -# See automake bug#10436. -check-no-trailing-backslash-in-recipes: - $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \ - CONFIG_SHELL='$(abs_top_builddir)/%D%/ax/shell-no-trail-bslash' -.PHONY: check-no-trailing-backslash-in-recipes - -# Some compilers out there (hello, MSVC) still choke on "-c -o" being -# passed together on the command line. Run the whole testsuite faking -# the presence of such a compiler, to help catch regressions that would -# otherwise only present themselves later "in the wild". See also the -# long discussion about automake bug#13378. -check-cc-no-c-o: - $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \ - AM_TESTSUITE_SIMULATING_NO_CC_C_O=yes -.PHONY: check-cc-no-c-o - -# Automake-generated Makefiles should work when run with parallel make. -check-parallel: - $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \ - AM_TESTSUITE_MAKE="$${AM_TESTSUITE_MAKE-$${MAKE-make}} -j4" -.PHONY: check-parallel - -## Checking the list of tests. -test_subdirs = %D% %D%/pm contrib/%D% -include %D%/CheckListOfTests.am - -# Run the testsuite with the installed aclocal and automake. -installcheck-local: installcheck-testsuite -installcheck-testsuite: - $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \ - am_running_installcheck=yes - -# Performance tests. -.PHONY: perf -perf: all - $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \ - TEST_SUITE_LOG='$(PERF_TEST_SUITE_LOG)' TESTS='$(perf_TESTS)' -PERF_TEST_SUITE_LOG = %D%/perf/test-suite.log -CLEANFILES += $(PERF_TEST_SUITE_LOG) -EXTRA_DIST += $(perf_TESTS) - -clean-local: clean-local-check -.PHONY: clean-local-check -clean-local-check: - $(AM_V_GEN)$(PERL) $(srcdir)/t/ax/deltree.pl t/*.dir t/*/*.dir */t/*.dir - -# vim: ft=automake noet diff --git a/t/local.mk b/t/local.mk new file mode 100644 index 000000000..d5fd00cb1 --- /dev/null +++ b/t/local.mk @@ -0,0 +1,268 @@ +## 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 . + +## ------------ ## +## Testsuite. ## +## ------------ ## + +# Run the tests with a proper shell detected at configure time. +LOG_COMPILER = ./pre-inst-env $(AM_TEST_RUNNER_SHELL) + +TEST_EXTENSIONS = .pl .sh .tap +SH_LOG_COMPILER = $(LOG_COMPILER) +TAP_LOG_COMPILER = $(LOG_COMPILER) +PL_LOG_COMPILER = ./pre-inst-env $(PERL) +AM_PL_LOG_FLAGS = -Mstrict -w + +TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(srcdir)/lib/tap-driver.sh + +AM_TAP_LOG_DRIVER_FLAGS = --merge + +EXTRA_DIST += %D%/README %D%/ax/is %D%/ax/is_newest %D%/ax/deltree.pl + + +## Will be updated later. +TESTS = + +# Some testsuite-influential variables should be overridable from the +# test scripts, but not from the environment. +# Keep this in sync with the similar list in ax/runtest.in. +AM_TESTS_ENVIRONMENT = \ + for v in \ + required \ + am_test_protocol \ + am_serial_tests \ + am_test_prefer_config_shell \ + am_original_AUTOMAKE \ + am_original_ACLOCAL \ + am_test_lib_sourced \ + test_lib_sourced \ + ; do \ + eval test x"\$${$$v}" = x || unset $$v; \ + done; +# We want warning messages and explanations for skipped tests to go to +# the console if possible, so set up 'stderr_fileno_' properly. +AM_TESTS_FD_REDIRECT = 9>&2 +AM_TESTS_ENVIRONMENT += stderr_fileno_=9; export stderr_fileno_; + +# For sourcing of extra "shell libraries" by our test scripts. As per +# POSIX, sourcing a file with '.' will cause it to be looked up in $PATH +# in case it is given with a relative name containing no slashes. +AM_TESTS_ENVIRONMENT += \ + if test $(srcdir) != .; then \ + PATH='$(abs_srcdir)/%D%/ax$(PATH_SEPARATOR)'$$PATH; \ + fi; \ + PATH='$(abs_builddir)/%D%/ax$(PATH_SEPARATOR)'$$PATH; \ + export PATH; + +# Hand-written tests. + +include $(srcdir)/%D%/list-of-tests.mk + +TESTS += $(handwritten_TESTS) +EXTRA_DIST += $(handwritten_TESTS) + +# Automatically-generated tests wrapping hand-written ones. +# Also, automatically-computed dependencies for tests. + +include $(srcdir)/%D%/testsuite-part.am + +TESTS += $(generated_TESTS) +EXTRA_DIST += $(generated_TESTS) + +$(srcdir)/%D%/testsuite-part.am: + $(AM_V_at)rm -f %D%/testsuite-part.tmp $@ + $(AM_V_GEN)$(PERL) $(srcdir)/gen-testsuite-part \ + --srcdir $(srcdir) > %D%/testsuite-part.tmp + $(AM_V_at)chmod a-w %D%/testsuite-part.tmp + $(AM_V_at)mv -f %D%/testsuite-part.tmp $@ +EXTRA_DIST += gen-testsuite-part + +# The dependecies declared here are not truly complete, but such +# completeness would cause more issues than it would solve. See +# automake bug#11347. +$(generated_TESTS): $(srcdir)/gen-testsuite-part +$(srcdir)/%D%/testsuite-part.am: $(srcdir)/gen-testsuite-part +$(srcdir)/%D%/testsuite-part.am: Makefile.am + +# Hand-written tests for stuff in 'contrib/'. +include $(srcdir)/contrib/%D%/local.mk +TESTS += $(contrib_TESTS) +EXTRA_DIST += $(contrib_TESTS) + +# Static dependencies valid for each test case (also further +# extended later). Note that use 'noinst_' rather than 'check_' +# as the prefix, because we really want them to be built by +# "make all". This makes it easier to run the test cases by +# hand after having simply configured and built the package. + +dist_noinst_DATA += \ + %D%/ax/test-init.sh \ + %D%/ax/test-lib.sh \ + %D%/ax/am-test-lib.sh \ + %D%/ax/tap-functions.sh + +# Few more static dependencies. +%D%/distcheck-missing-m4.log: %D%/ax/distcheck-hook-m4.am +%D%/distcheck-outdated-m4.log: %D%/ax/distcheck-hook-m4.am +EXTRA_DIST += %D%/ax/distcheck-hook-m4.am + +%D%/ax/test-defs.sh: %D%/ax/test-defs.in Makefile + $(AM_V_at)rm -f $@ $@-t + $(AM_V_at)$(MKDIR_P) %D%/ax + $(AM_V_GEN)in=%D%/ax/test-defs.in \ + && $(do_subst) <$(srcdir)/$$in >$@-t + $(generated_file_finalize) +EXTRA_DIST += %D%/ax/test-defs.in +CLEANFILES += %D%/ax/test-defs.sh +nodist_noinst_DATA += %D%/ax/test-defs.sh + +%D%/ax/shell-no-trail-bslash: %D%/ax/shell-no-trail-bslash.in Makefile + $(AM_V_at)rm -f $@ $@-t + $(AM_V_GEN)in=%D%/ax/shell-no-trail-bslash.in \ + && $(MKDIR_P) %D%/ax \ + && $(do_subst) <$(srcdir)/$$in >$@-t \ + && chmod a+x $@-t + $(generated_file_finalize) +EXTRA_DIST += %D%/ax/shell-no-trail-bslash.in +CLEANFILES += %D%/ax/shell-no-trail-bslash +nodist_noinst_SCRIPTS += %D%/ax/shell-no-trail-bslash + +%D%/ax/cc-no-c-o: %D%/ax/cc-no-c-o.in Makefile + $(AM_V_at)rm -f $@ $@-t + $(AM_V_GEN)in=%D%/ax/cc-no-c-o.in \ + && $(MKDIR_P) %D%/ax \ + && $(do_subst) <$(srcdir)/$$in >$@-t \ + && chmod a+x $@-t + $(generated_file_finalize) +EXTRA_DIST += %D%/ax/cc-no-c-o.in +CLEANFILES += %D%/ax/cc-no-c-o +nodist_noinst_SCRIPTS += %D%/ax/cc-no-c-o + +runtest: %D%/ax/runtest.in Makefile + $(AM_V_at)rm -f $@ $@-t + $(AM_V_GEN)in=%D%/ax/runtest.in \ + && $(MKDIR_P) %D%/ax \ + && $(do_subst) <$(srcdir)/$$in >$@-t \ + && chmod a+x $@-t + $(generated_file_finalize) +EXTRA_DIST += %D%/ax/runtest.in +CLEANFILES += runtest +nodist_noinst_SCRIPTS += runtest + +# If two test scripts have the same basename, they will end up sharing +# the same log file, leading to all sort of undefined and undesired +# behaviours. +check-no-repeated-test-name: + @LC_ALL=C; export LC_ALL; \ + lst='$(TEST_LOGS)'; for log in $$lst; do echo $$log; done \ + | sort | uniq -c | awk '($$1 > 1) { print }' \ + | sed 's/\.log$$//' | grep . >&2 \ + && { \ + echo $@: test names listed above are duplicated >&2; \ + exit 1; \ + }; : +check-local: check-no-repeated-test-name +.PHONY: check-no-repeated-test-name + +# Check that our test cases are syntactically correct. +# See automake bug#11898. +check-tests-syntax: + @st=0; \ + err () { echo "$@: $$*" >&2; st=1; }; \ +## The user might do something like "make check TESTS=t/foo" or +## "make check TESTS_LOGS=t/foo.log" and expect (say) the test +## 't/foo.sh' to be run; this has worked well until today, and +## we want to continue supporting this use case. + bases=`for log in : $(TEST_LOGS); do echo $$log; done \ + | sed -e '/^:$$/d' -e 's/\.log$$//'`; \ + for bas in $$bases; do \ + for suf in sh tap pl; do \ + tst=$$bas.$$suf; \ +## Emulate VPATH search. + if test -f $$tst; then \ + break; \ + elif test -f $(srcdir)/$$tst; then \ + tst=$(srcdir)/$$tst; \ + break; \ + else \ + tst=''; \ + fi; \ + done; \ + test -n "$$tst" || err "couldn't find test '$$bas'"; \ +## Don't check that perl tests are valid shell scripts! + test $$suf = pl && continue; \ + $(AM_V_P) && echo " $(AM_TEST_RUNNER_SHELL) -n $$tst"; \ + $(AM_TEST_RUNNER_SHELL) -n "$$tst" \ + || err "test '$$tst' syntactically invalid"; \ + done; \ + exit $$st +check-local: check-tests-syntax +.PHONY: check-tests-syntax + +# Recipes with a trailing backslash character (possibly followed by +# blank characters only) can cause spurious syntax errors with at +# least older bash versions (e.g., bash 2.05b), and can be potentially +# be unportable to other weaker shells. Run the testsuite in a way +# that helps catching such problems in Automake-generated recipes. +# See automake bug#10436. +check-no-trailing-backslash-in-recipes: + $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \ + CONFIG_SHELL='$(abs_top_builddir)/%D%/ax/shell-no-trail-bslash' +.PHONY: check-no-trailing-backslash-in-recipes + +# Some compilers out there (hello, MSVC) still choke on "-c -o" being +# passed together on the command line. Run the whole testsuite faking +# the presence of such a compiler, to help catch regressions that would +# otherwise only present themselves later "in the wild". See also the +# long discussion about automake bug#13378. +check-cc-no-c-o: + $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \ + AM_TESTSUITE_SIMULATING_NO_CC_C_O=yes +.PHONY: check-cc-no-c-o + +# Automake-generated Makefiles should work when run with parallel make. +check-parallel: + $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \ + AM_TESTSUITE_MAKE="$${AM_TESTSUITE_MAKE-$${MAKE-make}} -j4" +.PHONY: check-parallel + +## Checking the list of tests. +test_subdirs = %D% %D%/pm contrib/%D% +include %D%/CheckListOfTests.am + +# Run the testsuite with the installed aclocal and automake. +installcheck-local: installcheck-testsuite +installcheck-testsuite: + $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \ + am_running_installcheck=yes + +# Performance tests. +.PHONY: perf +perf: all + $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \ + TEST_SUITE_LOG='$(PERF_TEST_SUITE_LOG)' TESTS='$(perf_TESTS)' +PERF_TEST_SUITE_LOG = %D%/perf/test-suite.log +CLEANFILES += $(PERF_TEST_SUITE_LOG) +EXTRA_DIST += $(perf_TESTS) + +clean-local: clean-local-check +.PHONY: clean-local-check +clean-local-check: + $(AM_V_GEN)$(PERL) $(srcdir)/t/ax/deltree.pl t/*.dir t/*/*.dir */t/*.dir + +# vim: ft=automake noet -- cgit v1.2.1