From: Ralf Wildenhues Date: Sun, 1 Mar 2009 15:51:34 +0000 (+0100) Subject: Fix recursive html and install-* doc rules for BSD make. X-Git-Tag: v1.10b~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d22169ba7c9707dd8bed90f1f2abcaeb59107ef9;p=thirdparty%2Fautomake.git Fix recursive html and install-* doc rules for BSD make. * automake.in (%required_targets): Add html-am, install-html-am, install-dvi-am, install-pdf-am, install-ps-am, install-info-am. * tests/txinfo32.test: New test. * tests/Makefile.am: Update. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index 3f2092e3d..78e1e03f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2009-03-01 Ralf Wildenhues + Fix recursive html and install-* doc rules for BSD make. + * automake.in (%required_targets): Add html-am, + install-html-am, install-dvi-am, install-pdf-am, install-ps-am, + install-info-am. + * tests/txinfo32.test: New test. + * tests/Makefile.am: Update. + Fix comment typo. * lib/am/distdir.am (distcheck): Fix typo in comment. diff --git a/Makefile.in b/Makefile.in index 2bcc7468d..6dde4e5df 100644 --- a/Makefile.in +++ b/Makefile.in @@ -678,6 +678,8 @@ dvi-am: html: html-recursive +html-am: + info: info-recursive info-am: @@ -686,19 +688,29 @@ install-data-am: install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-binSCRIPTS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-exec-hook install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive diff --git a/automake.in b/automake.in index 2ea317ba8..156dfba1c 100755 --- a/automake.in +++ b/automake.in @@ -458,12 +458,18 @@ my %required_targets = # FIXME: Not required, temporary hacks. # Well, actually they are sort of required: the -recursive # targets will run them anyway... + 'html-am' => 1, 'dvi-am' => 1, 'pdf-am' => 1, 'ps-am' => 1, 'info-am' => 1, 'install-data-am' => 1, 'install-exec-am' => 1, + 'install-html-am' => 1, + 'install-dvi-am' => 1, + 'install-pdf-am' => 1, + 'install-ps-am' => 1, + 'install-info-am' => 1, 'installcheck-am' => 1, 'uninstall-am' => 1, diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 5459256c1..3217731fd 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -543,6 +543,8 @@ dvi-am: html: html-recursive +html-am: + info: info-recursive info-am: @@ -551,18 +553,28 @@ install-data-am: install-dist_perllibDATA install-nodist_perllibDATA install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index 04f340efa..520048a76 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -366,6 +366,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -374,18 +376,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am diff --git a/lib/Makefile.in b/lib/Makefile.in index 4b1020443..f45ea0b69 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -517,6 +517,8 @@ dvi-am: html: html-recursive +html-am: + info: info-recursive info-am: @@ -526,18 +528,28 @@ install-data-am: install-dist_pkgvdataDATA install-dist_scriptDATA $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: installcheck-local maintainer-clean: maintainer-clean-recursive diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index 4fe7d63e5..ea62647ed 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -337,6 +337,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -345,18 +347,28 @@ install-data-am: install-dist_amDATA install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am diff --git a/m4/Makefile.in b/m4/Makefile.in index fdb2ed948..f9f1adb83 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -334,6 +334,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -342,18 +344,28 @@ install-data-am: install-dist_m4dataDATA install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am diff --git a/tests/Makefile.am b/tests/Makefile.am index 1ed0fd304..3a55de003 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -634,6 +634,7 @@ txinfo28.test \ txinfo29.test \ txinfo30.test \ txinfo31.test \ +txinfo32.test \ transform.test \ transform2.test \ unused.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 4db097fea..259ca62ea 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -789,6 +789,7 @@ txinfo28.test \ txinfo29.test \ txinfo30.test \ txinfo31.test \ +txinfo32.test \ transform.test \ transform2.test \ unused.test \ @@ -1038,6 +1039,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -1046,18 +1049,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am diff --git a/tests/txinfo32.test b/tests/txinfo32.test new file mode 100755 index 000000000..267c0e9aa --- /dev/null +++ b/tests/txinfo32.test @@ -0,0 +1,42 @@ +#! /bin/sh +# Copyright (C) 2009 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 3, 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 . + +# Make sure the documentation targets work as required with BSD make, +# even in the presence of subdirs (requires presence of default *-am rules). + +. ./defs || Exit 1 + +set -e + +mkdir sub +cat >>configure.in <<'END' +AC_CONFIG_FILES([sub/Makefile]) +AC_OUTPUT +END +cat >Makefile.am <<'END' +SUBDIRS = sub +END +: >sub/Makefile.am + +$ACLOCAL +$AUTOCONF +$AUTOMAKE +./configure "--prefix=`pwd`/inst" +$MAKE html dvi ps pdf info \ + install-html install-dvi install-ps install-pdf install-info \ + install-man install-data install-exec install uninstall + +Exit 0