From MAILER-DAEMON Thu Feb 01 19:01:03 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ehOmt-0007rf-Ky for mharc-groff-commit@gnu.org; Thu, 01 Feb 2018 19:01:03 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehOln-0007b7-Rx for groff-commit@gnu.org; Thu, 01 Feb 2018 19:01:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehOkj-0007X5-Sx for groff-commit@gnu.org; Thu, 01 Feb 2018 18:59:55 -0500 Received: from vcs0.savannah.gnu.org ([208.118.235.201]:34610) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehOkj-0007WI-H6 for groff-commit@gnu.org; Thu, 01 Feb 2018 18:58:49 -0500 Received: by vcs0.savannah.gnu.org (Postfix, from userid 132203) id 0442620101; Thu, 1 Feb 2018 18:58:48 -0500 (EST) To: groff-commit@gnu.org Subject: [groff] 01/02: Use gnulib script 'git-version-gen' to define groff's version MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Reply-To: Bertrand Garrigues In-Reply-To: groff@gnu.org References: <20180201235848.17891.94521@vcs0.savannah.gnu.org> X-Git-Repo: groff X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 126453131024933ec17b9f22701decdf36275bc4 Auto-Submitted: auto-generated Message-Id: <20180201235849.0442620101@vcs0.savannah.gnu.org> Date: Thu, 1 Feb 2018 18:58:48 -0500 (EST) From: bertrand.garrigues@laposte.net (Bertrand Garrigues) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.201 X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Feb 2018 00:01:02 -0000 bgarrigues pushed a commit to branch master in repository groff. commit 126453131024933ec17b9f22701decdf36275bc4 Author: Bertrand Garrigues Date: Sun Jan 14 00:04:13 2018 +0100 Use gnulib script 'git-version-gen' to define groff's version =20 * bootstrap.conf: add 'git-version-gen' script. =20 * configure.ac: suppress 'GROFF_VERSION_STRING' and replace it by the script. If the current commit corresponds to a tag, then the version is simply the tag name. Otherwise the version has the format: --. The version is now stored in '.version'. =20 * REVISION: removed. =20 * VERSION: removed. =20 * Makefile.am: define 'MAJOR_VERSION', 'MINOR_VERSION' and 'REVISION'. =20 * src/libs/libgroff/libgroff.am: use 'MAJOR_VERSION', 'MINOR_VERSION' and 'REVISION', add dependency on '.version'. =20 * src/roff/troff/troff.am: ditto. =20 * contrib/mom/om.tmac-u (short_revision): new string that extracts the first digit of the revision, to be used when checking groff version. --- .gitignore | 3 +++ ChangeLog | 29 +++++++++++++++++++++++++++++ Makefile.am | 35 ++++++++++++++++++++++++++++++++--- REVISION | 1 - VERSION | 1 - bootstrap.conf | 1 + configure.ac | 22 ++-------------------- contrib/mom/om.tmac-u | 9 ++++++--- src/libs/libgroff/libgroff.am | 11 ++++------- src/roff/troff/troff.am | 11 ++++------- 10 files changed, 81 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index 823129f..d58329c 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,6 @@ stamp-* /troff /xtotroff /gendef.sh +/.version +/cscope.out +/build diff --git a/ChangeLog b/ChangeLog index ea494a1..ceed13d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +2018-02-02 Bertrand Garrigues + + Use gnulib script 'git-version-gen' to define groff's version + + * bootstrap.conf: add 'git-version-gen' script. + + * configure.ac: suppress 'GROFF_VERSION_STRING' and replace it by + the script. If the current commit corresponds to a tag, then the + version is simply the tag name. Otherwise the version has the + format: --. The + version is now stored in '.version'. + + * REVISION: removed. + + * VERSION: removed. + + * Makefile.am: define 'MAJOR_VERSION', 'MINOR_VERSION' and + 'REVISION'. + + * src/libs/libgroff/libgroff.am: use 'MAJOR_VERSION', + 'MINOR_VERSION' and 'REVISION', add dependency on '.version'. + + * src/roff/troff/troff.am: ditto. + + * contrib/mom/om.tmac-u (short_revision): new string that extracts + the first digit of the revision, to be used when checking groff + version. + + 2018-01-18 Deri James =20 On reflection using an array for Filter is not optimal. diff --git a/Makefile.am b/Makefile.am index 4cd4cf0..7de03f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,9 +57,7 @@ SH_SEP=3D@PATH_SEPARATOR@ # otherwise no. =20 =20 -# VERSION is set by automake, based on what is passed to AC_INIT. We -# pass GROFF_VERSION_STRING to it, which skips the revision if set to -# 0. +# VERSION is set by automake, based on what is passed to AC_INIT. =20 # PAGE # Define `page' to be letter if your PostScript printer uses 8.5x11 @@ -617,6 +615,30 @@ if MAKE_DONT_HAVE_RM RM =3D rm -f endif =20 +# 'VERSION' is generated by gnulib script git-version-gen, using the +# command 'git describe': +# +# - From a git repository: if the current commit corresponds to a +# tag, then 'VERSION' is simply the tag (e.g. 1.22.3). Otherwise +# 'VERSION' has the following format: +# -- +# +# With: +# . tag: the most recent tag reachable from the current commit +# . nb_commits: number of commits between the most recent tag and +# the current commit. +# . current commit, abbreviated. +# For example: 1.22.3.real.434-5aafd +# The version is stored in .version. +# +# - From a tarball, the version is taken from .tarball-version +# +# REVISION is the full revision given by git-version-gen, which can +# have non-alphanumeric symbols. +MAJOR_VERSION =3D`echo $(VERSION) | sed 's/\([0-9]\+\)\.[0-9]\+.*/\1/'` +MINOR_VERSION =3D`echo $(VERSION) | sed 's/[0-9]\+\.\([0-9]\+\).*/\1/'` +REVISION =3D `echo $(VERSION) | sed 's/[0-9]\+\.[0-9]\+\.\(.*\)/\1/'` + # Non-recursive makefile system. See Automake manual '7.3 An # Alternative Approach to Subdirectories'. We use a single Makefile.am # that includes other .am files, rather than using SUBDIRS. Note that @@ -900,6 +922,13 @@ SUFFIXES +=3D .man -e "s|[@]VERSION[@]|$(VERSION)|g" \ $< >$@ =20 +# Version files - see script 'build-aux/git-gen-version' +EXTRA_DIST +=3D $(top_srcdir)/.version +BUILT_SOURCES +=3D $(top_srcdir)/.version +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version =20 ######################################################################## ### Emacs settings diff --git a/REVISION b/REVISION deleted file mode 100644 index 00750ed..0000000 --- a/REVISION +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/VERSION b/VERSION deleted file mode 100644 index 71f7f51..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -1.22 diff --git a/bootstrap.conf b/bootstrap.conf index dc39207..deda4f6 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -36,6 +36,7 @@ checkout_only_file=3DREADME.git # havelib provides config.rpath # can be get through gettext though gnulib_modules=3D" + git-version-gen havelib non-recursive-gnulib-prefix-hack wcwidth diff --git a/configure.ac b/configure.ac index 40c829d..bf46a4e 100644 --- a/configure.ac +++ b/configure.ac @@ -18,29 +18,11 @@ # # Process this file with autoconf to produce a configure script. =20 -dnl Use `VERSION' and `REVISION' files to get version. -m4_define([GROFF_VERSION_DATA], m4_include([VERSION])) -m4_define([GROFF_REVISION_DATA], m4_include([REVISION])) - -dnl Strip off newline characters. -m4_define([GROFF_VERSION], - m4_substr(GROFF_VERSION_DATA, - [0], m4_decr(m4_len(GROFF_VERSION_DATA)))) -m4_define([GROFF_REVISION], - m4_substr(GROFF_REVISION_DATA, - [0], m4_decr(m4_len(GROFF_REVISION_DATA)))) - -dnl Don't use revision if it is zero. -m4_define([GROFF_VERSION_STRING], - m4_if(m4_eval(GROFF_REVISION[ > 0]), - [1], - GROFF_VERSION[.]GROFF_REVISION, - GROFF_VERSION)) - AC_INIT([GNU Troff], - GROFF_VERSION_STRING, + m4_esyscmd([build-aux/git-version-gen --prefix "" .tarball-versi= on]), [bug-groff@gnu.org], [groff]) + AC_PREREQ([2.62]) =20 # Directories where the helper scripts should be found. This must be con= sistent diff --git a/contrib/mom/om.tmac-u b/contrib/mom/om.tmac-u index 78576af..96c06f3 100644 --- a/contrib/mom/om.tmac-u +++ b/contrib/mom/om.tmac-u @@ -58,6 +58,9 @@ extensions, and float management). .if dVERSION \{\ . ab [mom]: Version \*[version] .\} +\# Groff revision +.ds short_revision \n[.Y] +.substring short_revision 0 0 \# \# Add supplementary styles .sty \n[.fp] UL \" Ultra Light @@ -552,10 +555,10 @@ end . fam \\*[$TYPEWRITER_FAM] . return . \} -. if (\\n[.x]\\n[.y]\\n[.Y] >=3D 1192) .ds $SAVED_STYLE \\n[.sty] +. if (\\n[.x]\\n[.y]\\*[short_revision] >=3D 1192) .ds $SAVED_STYLE \= \n[.sty] . ft 0 . fam \\*[$FAMILY] -. if (\\n[.x]\\n[.y]\\n[.Y] >=3D 1192) \{\ +. if (\\n[.x]\\n[.y]\\*[short_revision] >=3D 1192) \{\ . ft \\*[$SAVED_STYLE] . if !F\\n[.fn] .ft 0 . \} @@ -592,7 +595,7 @@ end . \} . ft 0 . ft \\*[$FONT] -. if (\\n[.x]\\n[.y]\\n[.Y] >=3D 1192) \{\ +. if (\\n[.x]\\n[.y]\\*[short_revision] >=3D 1192) \{\ . if '\\n[.sty]'' \{\ . if !F\\n[.fn] \{\ . if !S\\*[$FONT] \{\ diff --git a/src/libs/libgroff/libgroff.am b/src/libs/libgroff/libgroff.a= m index b9cf9b1..b25d64c 100644 --- a/src/libs/libgroff/libgroff.am +++ b/src/libs/libgroff/libgroff.am @@ -96,9 +96,6 @@ EXTRA_DIST +=3D \ src/libs/libgroff/make-uniuni \ src/libs/snprintf/snprintf.c =20 -src_version=3D`cat $(top_srcdir)/VERSION` -src_revision=3D`cat $(top_srcdir)/REVISION` - CLEANFILES +=3D \ src/libs/libgroff/version.cpp \ charset.alias \ @@ -111,12 +108,12 @@ src/libs/libgroff/libgroff_a-fontfile.$(OBJEXT): de= fs.h src/libs/libgroff/libgroff_a-macropath.$(OBJEXT): defs.h src/libs/libgroff/libgroff_a-relocate.$(OBJEXT): defs.h =20 -src/libs/libgroff/version.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVIS= ION +src/libs/libgroff/version.cpp: $(top_srcdir)/.version @echo Making version.cpp - @echo const char \*version_string =3D \"$(src_version)\"\; >$@ - @echo const char \*revision_string =3D \"$(src_revision)\"\; >>$@ + @echo const char \*version_string =3D \"$(MAJOR_VERSION).$(MINOR_VERSIO= N)\"\; >$@ + @echo const char \*revision_string =3D \"$(REVISION)\"\; >>$@ @echo extern \"C\" { >>$@ - @echo const char \*Version_string =3D \"$(src_version).$(src_revision)\= "\; >>$@ + @echo const char \*Version_string =3D \"$(VERSION)\"\; >>$@ @echo } >>$@ \ | sed -e 's/\.0\"/\"/' >>$@ =20 diff --git a/src/roff/troff/troff.am b/src/roff/troff/troff.am index 191798a..d9c2539 100644 --- a/src/roff/troff/troff.am +++ b/src/roff/troff/troff.am @@ -52,15 +52,12 @@ nodist_troff_SOURCES =3D src/roff/troff/majorminor.cp= p src/roff/troff/input.$(OBJEXT): defs.h CLEANFILES +=3D src/roff/troff/majorminor.cpp =20 -src/roff/troff/majorminor.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVIS= ION +src/roff/troff/majorminor.cpp: $(top_srcdir)/.version @echo Making $@ @$(RM) $@ - @echo const char \*major_version =3D \ - \"`sed -e 's/^\([^.]*\)\..*$$/\1/' $(top_srcdir)/VERSION`\"\; >$@ - @echo const char \*minor_version =3D \ - \"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' $(top_srcdir)/VERSION`\"\; = \ - >>$@ - @echo const char \*revision =3D \"`cat $(top_srcdir)/REVISION`\"\; >>$@ + @echo const char \*major_version =3D \"$(MAJOR_VERSION)\"\; >$@ + @echo const char \*minor_version =3D \"$(MINOR_VERSION)\"\; >>$@ + @echo const char \*revision =3D \"$(REVISION)\"\; >>$@ =20 =20 ######################################################################## From MAILER-DAEMON Thu Feb 01 19:03:47 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ehOpX-0000P1-8s for mharc-groff-commit@gnu.org; Thu, 01 Feb 2018 19:03:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehOoS-0008Bo-2r for groff-commit@gnu.org; Thu, 01 Feb 2018 19:03:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehOkl-0007Zs-TE for groff-commit@gnu.org; Thu, 01 Feb 2018 19:02:39 -0500 Received: from vcs0.savannah.gnu.org ([208.118.235.201]:34611) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehOkl-0007ZQ-Dj for groff-commit@gnu.org; Thu, 01 Feb 2018 18:58:51 -0500 Received: by vcs0.savannah.gnu.org (Postfix, from userid 132203) id 11EE920024; Thu, 1 Feb 2018 18:58:49 -0500 (EST) To: groff-commit@gnu.org Subject: [groff] 02/02: Update 'gnulib' submodule. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Reply-To: Bertrand Garrigues In-Reply-To: groff@gnu.org References: <20180201235848.17891.94521@vcs0.savannah.gnu.org> X-Git-Repo: groff X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 38fde07534a9ee5475383be007a86a1df4d0b1b3 Auto-Submitted: auto-generated Message-Id: <20180201235851.11EE920024@vcs0.savannah.gnu.org> Date: Thu, 1 Feb 2018 18:58:49 -0500 (EST) From: bertrand.garrigues@laposte.net (Bertrand Garrigues) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.201 X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Feb 2018 00:03:46 -0000 bgarrigues pushed a commit to branch master in repository groff. commit 38fde07534a9ee5475383be007a86a1df4d0b1b3 Author: Bertrand Garrigues Date: Fri Feb 2 00:42:14 2018 +0100 Update 'gnulib' submodule. =20 * gnulib: now points on cf56f8f618c48cfadd2499ced58574633d12f129 from 'gnulib' repository. --- ChangeLog | 8 +++++++- gnulib | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ceed13d..eea2779 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2018-02-02 Bertrand Garrigues =20 + Update 'gnulib' submodule. + + * gnulib: now points on cf56f8f618c48cfadd2499ced58574633d12f129 + from 'gnulib' repository. + +2018-02-02 Bertrand Garrigues + Use gnulib script 'git-version-gen' to define groff's version =20 * bootstrap.conf: add 'git-version-gen' script. @@ -26,7 +33,6 @@ the first digit of the revision, to be used when checking groff version. =20 - 2018-01-18 Deri James =20 On reflection using an array for Filter is not optimal. diff --git a/gnulib b/gnulib index e706941..cf56f8f 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit e70694158bc1da629241f24757076278aa60a356 +Subproject commit cf56f8f618c48cfadd2499ced58574633d12f129 From MAILER-DAEMON Sat Feb 17 15:33:34 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1en9As-0001aW-Gr for mharc-groff-commit@gnu.org; Sat, 17 Feb 2018 15:33:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1en9An-0001Xk-UV for groff-commit@gnu.org; Sat, 17 Feb 2018 15:33:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1en9Am-0001HN-Ks for groff-commit@gnu.org; Sat, 17 Feb 2018 15:33:29 -0500 Received: from vcs0.savannah.gnu.org ([208.118.235.201]:37781) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1en9Am-0001HF-HZ for groff-commit@gnu.org; Sat, 17 Feb 2018 15:33:28 -0500 Received: by vcs0.savannah.gnu.org (Postfix, from userid 71277) id 1A1AB2068E; Sat, 17 Feb 2018 15:33:28 -0500 (EST) To: groff-commit@gnu.org Subject: [groff] 01/01: Add preconv(1) Coding Tags to mom example files and automake.mom. Add note to INSTALL.REPO to ignore "can't transparently output node at top level" and "can't translate character code n to special character 'c' in transparent throughput" warnings. Fix instructions for building typesetting.mom in mom/examples/README.txt to include -k flag. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Reply-To: Peter Schaffter In-Reply-To: groff@gnu.org References: <20180217203327.31874.59864@vcs0.savannah.gnu.org> X-Git-Repo: groff X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 6675f5c6834febbe6d93e4b6551d42095ef7e6d1 Auto-Submitted: auto-generated Message-Id: <20180217203328.1A1AB2068E@vcs0.savannah.gnu.org> Date: Sat, 17 Feb 2018 15:33:27 -0500 (EST) From: peter@schaffter.ca (Peter Schaffter) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.201 X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Feb 2018 20:33:31 -0000 PTPi pushed a commit to branch master in repository groff. commit 6675f5c6834febbe6d93e4b6551d42095ef7e6d1 Author: Peter Schaffter Date: Sat Feb 17 15:28:30 2018 -0500 Add preconv(1) Coding Tags to mom example files and automake.mom. Add note to INSTALL.REPO to ignore "can't transparently output node at top level" and "can't translate character code n to special character 'c' in transparent throughput" warnings. Fix instructions for building typesetting.mom in mom/examples/README.= txt to include -k flag. --- INSTALL.REPO | 6 ++++++ contrib/mom/examples/README.txt | 8 ++++---- contrib/mom/examples/letter.mom | 3 ++- contrib/mom/examples/mom-pdf.mom | 2 ++ contrib/mom/examples/mon_premier_doc.mom | 2 ++ contrib/mom/examples/sample_docs.mom | 2 ++ contrib/mom/examples/typesetting.mom | 2 ++ doc/automake.mom | 2 ++ 8 files changed, 22 insertions(+), 5 deletions(-) diff --git a/INSTALL.REPO b/INSTALL.REPO index bb285a2..47912b4 100644 --- a/INSTALL.REPO +++ b/INSTALL.REPO @@ -84,7 +84,13 @@ warning like: Just ignore this. It doesn't occur in the actual versions of `autoreconf'. =20 +Troff errors of the types =20 + can't transparently output node at top level + and + can't translate character code n to special character 'c' in transpare= nt throughput + +may safely be ignored. =20 2. Modification of autotools files ---------------------------------- diff --git a/contrib/mom/examples/README.txt b/contrib/mom/examples/READM= E.txt index b73f052..cb4e157 100644 --- a/contrib/mom/examples/README.txt +++ b/contrib/mom/examples/README.txt @@ -1,4 +1,4 @@ - -*- text -*- + -*- mode: text; coding: utf-8; -*- Copyright (C) 2004-2017 Free Software Foundation, Inc. =20 Copying and distribution of this file, with or without modification, @@ -18,11 +18,11 @@ I haven't included the PDF output because I want to k= eep the mom archive as lean as possible. To view the PDF output, process the files with pdfmom(1). =20 - pdfmom -k letter.mom > letter.pdf pdfmom mom-pdf.mom > mom-pdf.pdf - pdfmom -k mon_premier_doc.mom > mon_premier_doc.pdf pdfmom sample_docs.mom > sample_docs.pdf - pdfmom typesetting.mom > typesetting.pdf + pdfmom -k letter.mom > letter.pdf + pdfmom -k mon_premier_doc.mom > mon_premier_doc.pdf + pdfmom -k typesetting.mom > typesetting.pdf =20 The files themselves -------------------- diff --git a/contrib/mom/examples/letter.mom b/contrib/mom/examples/lette= r.mom index d680156..59f2a0f 100644 --- a/contrib/mom/examples/letter.mom +++ b/contrib/mom/examples/letter.mom @@ -1,4 +1,5 @@ -. +.\" -*- mode: text; coding: utf-8; -*- +\# \# Copyright (C) 2004-2017 Free Software Foundation, Inc. \# \# Copying and distribution of this file, with or without modification, diff --git a/contrib/mom/examples/mom-pdf.mom b/contrib/mom/examples/mom-= pdf.mom index 2b641f6..ecc3777 100644 --- a/contrib/mom/examples/mom-pdf.mom +++ b/contrib/mom/examples/mom-pdf.mom @@ -1,3 +1,5 @@ +.\" -*- mode: text; coding: utf-8; -*- +.\" .\" Copyright (C) 2012-2017 Free Software Foundation, Inc. .\" .\" This file is part of mom, which is part of groff, a free software diff --git a/contrib/mom/examples/mon_premier_doc.mom b/contrib/mom/examp= les/mon_premier_doc.mom index 7e10157..3a892e1 100644 --- a/contrib/mom/examples/mon_premier_doc.mom +++ b/contrib/mom/examples/mon_premier_doc.mom @@ -1,3 +1,5 @@ +.\" -*- mode: text; coding: utf-8; -*- +\# \# Copyright (C) 2015-2017 Free Software Foundation, Inc. \# \# Copying and distribution of this file, with or without modification, diff --git a/contrib/mom/examples/sample_docs.mom b/contrib/mom/examples/= sample_docs.mom index 5a0572e..6886825 100644 --- a/contrib/mom/examples/sample_docs.mom +++ b/contrib/mom/examples/sample_docs.mom @@ -1,3 +1,5 @@ +.\" -*- mode: text; coding: utf-8; -*- +\# \# Copyright (C) 2004-2017 Free Software Foundation, Inc. \# \# Copying and distribution of this file, with or without modification, diff --git a/contrib/mom/examples/typesetting.mom b/contrib/mom/examples/= typesetting.mom index 2aa19c0..e0084d8 100644 --- a/contrib/mom/examples/typesetting.mom +++ b/contrib/mom/examples/typesetting.mom @@ -1,3 +1,5 @@ +.\" -*- mode: text; coding: utf-8; -*- +\# \# Copyright 2004-2017 Free Software Foundation, Inc. \# \# Copying and distribution of this file, with or without modification, diff --git a/doc/automake.mom b/doc/automake.mom index 5492fb6..634404b 100644 --- a/doc/automake.mom +++ b/doc/automake.mom @@ -1,3 +1,5 @@ +.\" -*- mode: text; coding: utf-8; -*- +.\" .\" Copyright =C2=A92014, 2017 Free Software Foundation .\" 51 Franklin St, Fifth Floor, Boston, MA 02110, USA .\" From MAILER-DAEMON Thu Feb 22 16:10:15 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1eoy87-0001Q2-9s for mharc-groff-commit@gnu.org; Thu, 22 Feb 2018 16:10:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eoy84-0001PP-V3 for groff-commit@gnu.org; Thu, 22 Feb 2018 16:10:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eoy84-0006Yg-1V for groff-commit@gnu.org; Thu, 22 Feb 2018 16:10:12 -0500 Received: from vcs0.savannah.gnu.org ([208.118.235.201]:41435) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eoy83-0006YW-UV for groff-commit@gnu.org; Thu, 22 Feb 2018 16:10:11 -0500 Received: by vcs0.savannah.gnu.org (Postfix, from userid 71277) id D87D520A22; Thu, 22 Feb 2018 16:10:11 -0500 (EST) To: groff-commit@gnu.org Subject: [groff] 02/02: Add missing .PP. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Reply-To: Peter Schaffter In-Reply-To: groff@gnu.org References: <20180222211011.17582.46092@vcs0.savannah.gnu.org> X-Git-Repo: groff X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: f7f0af4cd8b61a467dd70322a961582b2f8a16cb Auto-Submitted: auto-generated Message-Id: <20180222211011.D87D520A22@vcs0.savannah.gnu.org> Date: Thu, 22 Feb 2018 16:10:11 -0500 (EST) From: peter@schaffter.ca (Peter Schaffter) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.201 X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Feb 2018 21:10:13 -0000 PTPi pushed a commit to branch master in repository groff. commit f7f0af4cd8b61a467dd70322a961582b2f8a16cb Author: Peter Schaffter Date: Thu Feb 22 16:09:07 2018 -0500 Add missing .PP. --- contrib/mom/examples/mom-pdf.mom | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/mom/examples/mom-pdf.mom b/contrib/mom/examples/mom-= pdf.mom index ecc3777..eaedb68 100644 --- a/contrib/mom/examples/mom-pdf.mom +++ b/contrib/mom/examples/mom-pdf.mom @@ -539,6 +539,7 @@ embedded in a document with the \[-Tps] option must be used. In most other cases, \[pdfmom] with no \[-T] flag is preferable. .HEADING 2 NAMED papersize "Setting papersize within a source file" +.PP A significant convenience afforded by using \[pdfmom] (or \[groff] with the \[-Tpdf] flag) is that papersizes or page dimensions set within mom source files (see From MAILER-DAEMON Thu Feb 22 16:10:15 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1eoy87-0001QN-Ds for mharc-groff-commit@gnu.org; Thu, 22 Feb 2018 16:10:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eoy84-0001PO-T5 for groff-commit@gnu.org; Thu, 22 Feb 2018 16:10:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eoy83-0006YY-V3 for groff-commit@gnu.org; Thu, 22 Feb 2018 16:10:12 -0500 Received: from vcs0.savannah.gnu.org ([208.118.235.201]:41431) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eoy83-0006YR-Qa for groff-commit@gnu.org; Thu, 22 Feb 2018 16:10:11 -0500 Received: by vcs0.savannah.gnu.org (Postfix, from userid 71277) id B8EA5209B1; Thu, 22 Feb 2018 16:10:11 -0500 (EST) To: groff-commit@gnu.org Subject: [groff] 01/02: Add tests for device and select fonts accordingly. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Reply-To: Peter Schaffter In-Reply-To: groff@gnu.org References: <20180222211011.17582.46092@vcs0.savannah.gnu.org> X-Git-Repo: groff X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: c0d4a853660c95732b5c69bd00130fb4f4cc1581 Auto-Submitted: auto-generated Message-Id: <20180222211011.B8EA5209B1@vcs0.savannah.gnu.org> Date: Thu, 22 Feb 2018 16:10:11 -0500 (EST) From: peter@schaffter.ca (Peter Schaffter) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.201 X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Feb 2018 21:10:13 -0000 PTPi pushed a commit to branch master in repository groff. commit c0d4a853660c95732b5c69bd00130fb4f4cc1581 Author: Peter Schaffter Date: Thu Feb 22 16:06:40 2018 -0500 Add tests for device and select fonts accordingly. --- contrib/mom/examples/typesetting.mom | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/contrib/mom/examples/typesetting.mom b/contrib/mom/examples/= typesetting.mom index e0084d8..479b264 100644 --- a/contrib/mom/examples/typesetting.mom +++ b/contrib/mom/examples/typesetting.mom @@ -299,8 +299,11 @@ done the wrong. Example 3: .ALD .25v .UNDERSCORE 3.5p "A \*[BU2]recipe for enumerated lists using indents" -.SP .5v \" Add an extra half line space -.FAM N \" New Century Schoolbook family +.SP .5v \" Add an extra half line space +.ie '\*[.T]'ps' \ +.FAM N \" New Century Schoolbook family +.el .if '\*[.T]'pdf' \ +.FAM U-N=20 .FT R .PT_SIZE 11 .LS 13 @@ -393,7 +396,10 @@ Example 4: .ALD .25v .UNDERSCORE 3.5p "A \*[BU 2]recipe for nested lists using string tabs" .SP .5v +.ie '\*[.T]'ps' \ .FAM N +.el .if '\*[.T]'pdf' \ +.FAM U-N .FT R .PT_SIZE 11 .LS 13 @@ -507,7 +513,10 @@ Example 5: .ALD .25v .UNDERSCORE 3.5p "Word spacing" .ALD 8p -.FAM P \" Palatino family +.ie '\*[.T]'ps' \ +.FAM P \" Palatino family +.el .if '\*[.T]'pdf' \ +.FAM U-P .PT_SIZE 11 .LS 14 \# @@ -550,7 +559,10 @@ Example 6: .ALD .25v .UNDERSCORE 3.5p "Line kerning" .ALD 8p -.FAM P \" Palatino family +.ie '\*[.T]'ps' \ +.FAM P \" Palatino family +.el .if '\*[.T]'pdf' \ +.FAM U-P .FT R .PT_SIZE 11 .LS 15 From MAILER-DAEMON Mon Feb 26 16:54:12 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1eqQiq-0000TH-FR for mharc-groff-commit@gnu.org; Mon, 26 Feb 2018 16:54:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqQim-0000T2-NM for groff-commit@gnu.org; Mon, 26 Feb 2018 16:54:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqQik-0007Sm-0r for groff-commit@gnu.org; Mon, 26 Feb 2018 16:54:08 -0500 Received: from vcs0.savannah.gnu.org ([208.118.235.201]:36478) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqQij-0007Si-Sg for groff-commit@gnu.org; Mon, 26 Feb 2018 16:54:05 -0500 Received: by vcs0.savannah.gnu.org (Postfix, from userid 132203) id 4742920AF5; Mon, 26 Feb 2018 16:54:05 -0500 (EST) To: groff-commit@gnu.org Subject: [groff] 01/01: Update installation doc. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Reply-To: Bertrand Garrigues In-Reply-To: groff@gnu.org References: <20180226215404.30918.72744@vcs0.savannah.gnu.org> X-Git-Repo: groff X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 6d41249a8c391eb6578fa5dd5222f683768326ed Auto-Submitted: auto-generated Message-Id: <20180226215405.4742920AF5@vcs0.savannah.gnu.org> Date: Mon, 26 Feb 2018 16:54:04 -0500 (EST) From: bertrand.garrigues@laposte.net (Bertrand Garrigues) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.201 X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2018 21:54:11 -0000 bgarrigues pushed a commit to branch master in repository groff. commit 6d41249a8c391eb6578fa5dd5222f683768326ed Author: Bertrand Garrigues Date: Mon Feb 26 22:51:10 2018 +0100 Update installation doc. =20 * INSTALL.REPO: mention that 'pkg-config' is a dependency. =20 * INSTALL.extra: add dependency 'makeinfo' and optional dependencies 'pkg-config' and 'uchardet'. =20 * TESTS: move to doc/automake_migration_tests.txt =20 * INSTALL.gen: remove, this file is redundant with the 'INSTALL' file from gnulib. --- ChangeLog | 14 ++ INSTALL.REPO | 2 + INSTALL.extra | 19 +- INSTALL.gen | 370 ------------------------= ------ Makefile.am | 2 - TESTS =3D> doc/automake_migration_tests.txt | 0 doc/doc.am | 2 + 7 files changed, 34 insertions(+), 375 deletions(-) diff --git a/ChangeLog b/ChangeLog index eea2779..943c015 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2018-02-26 Bertrand Garrigues + + Update installation doc. + + * INSTALL.REPO: mention that 'pkg-config' is a dependency. + + * INSTALL.extra: add dependency 'makeinfo' and optional + dependencies 'pkg-config' and 'uchardet'. + + * TESTS: move to doc/automake_migration_tests.txt + + * INSTALL.gen: remove, this file is redundant with the 'INSTALL' + file from gnulib. + 2018-02-02 Bertrand Garrigues =20 Update 'gnulib' submodule. diff --git a/INSTALL.REPO b/INSTALL.REPO index 47912b4..bd74e8c 100644 --- a/INSTALL.REPO +++ b/INSTALL.REPO @@ -26,6 +26,8 @@ versions of the autotools, set the following environmen= t variables: export AUTOMAKE_VERSION=3D1.14 export AUTOCONF_VERSION=3D2.69 =20 +You will also need to have `pkg-config' installed on your system. + First invoke the bootstrap script: =20 $ ./bootstrap diff --git a/INSTALL.extra b/INSTALL.extra index f1af788..d7df13b 100644 --- a/INSTALL.extra +++ b/INSTALL.extra @@ -1,4 +1,4 @@ - Copyright 1997-2014 Free Software Foundation, Inc. + Copyright 1997-2018 Free Software Foundation, Inc. =20 Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -76,8 +76,8 @@ For instructions how to build groff with the MinGW tool= s for MS-Windows, see the file README.MinGW. =20 =20 -Miscellaneous -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +Dependencies +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 groff is written in C++, so you need a C++ compiler. The C++ source files use a suffix of `.cpp', so your C++ compiler must be able to @@ -97,6 +97,19 @@ Many programs within the `groff' system are written in= the Perl language. So you need a `perl' program with the least version of `v5.6.1'. =20 +In order to build the documentation you would need `makeinfo' from the +'texinfo' package, in fact `configure' will fail if this program is +not found unless you pass the option `with-doc=3Dno'. + +The `uchardet' library is an optional dependency of the `preconv' +program: if this library is found by `configure' it will be +automatically used by `preconv'. In order to discover the presence of +the `uchardet' library you would also need to have the `pkg-config' +program installed on your system. + + +Miscellaneous +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 If you want A4 or letter paper format and the configure script produces an incorrect guess, say diff --git a/INSTALL.gen b/INSTALL.gen deleted file mode 100644 index 2099840..0000000 --- a/INSTALL.gen +++ /dev/null @@ -1,370 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -Inc. - - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. - -Basic Installation -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - - Briefly, the shell command `./configure && make && make install' -should configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=3Dconfig.cache' or simply `-C') that save= s -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - - The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. - - 4. Type `make install' to install the programs and any data files and - documentation. When installing into a prefix owned by root, it is - recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root - privileges. - - 5. Optionally, type `make installcheck' to repeat any self-tests, but - this time using the binaries in their final installed location. - This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required - root privileges, verifies that the installation completed - correctly. - - 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 7. Often, you can also type `make uninstall' to remove the installed - files again. In practice, not all packages have tested that - uninstallation works correctly, even though it is required by the - GNU Coding Standards. - - 8. Some packages, particularly those that use Automake, provide `make - distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. - This target is generally not run by end users. - -Compilers and Options -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=3Dc99 CFLAGS=3D-g LIBS=3D-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC=3D"gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64= " \ - CXX=3D"g++ -arch i386 -arch x86_64 -arch ppc -arch ppc6= 4" \ - CPP=3D"gcc -E" CXXCPP=3D"g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - -Installation Names -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=3DPREFIX', where PREFIX must be an -absolute file name. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=3DPREFIX' to `configure', the package use= s -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=3DDIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory -specifications that were not explicitly provided. - - The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or -both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without -having to reconfigure or recompile. - - The first method involves providing an override variable for each -affected directory. For example, `make install -prefix=3D/alternate/directory' will choose an alternate location for all -directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=3D/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and -does not work on platforms that have drive letters. On the other hand, -it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. - -Optional Features -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=3DPREFIX' or `--program-suffix=3DSUFFIX'. - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=3DDIR' and -`--x-libraries=3DDIR' to specify their locations. - - Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=3D1'; while running `./configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=3D0'. - -Particular systems -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC=3D"cc -Ae -D_XOPEN_SOURCE=3D500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC=3D"cc" - -and if that doesn't work, try - - ./configure CC=3D"cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=3D/boot/common - -Specifying the System Type -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=3DTYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS - KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=3DTYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=3DTYPE'. - -Sharing Defaults -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=3Dvalue'. For example: - - ./configure CC=3D/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: - - CONFIG_SHELL=3D/bin/bash ./configure CONFIG_SHELL=3D/bin/bash - -`configure' Invocation -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. - -`--help=3Dshort' -`--help=3Drecursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=3DFILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=3Dconfig.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=3DDIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`--prefix=3DDIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. diff --git a/Makefile.am b/Makefile.am index 7de03f5..7dcdbaa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -863,7 +863,6 @@ EXTRA_DIST +=3D \ gendef.sh \ INSTALL.REPO \ INSTALL.extra \ - INSTALL.gen \ LICENSES \ MANIFEST \ mdate.sh \ @@ -871,7 +870,6 @@ EXTRA_DIST +=3D \ PROBLEMS \ PROJECTS \ README.MinGW \ - TESTS \ arch/djgpp \ font/util/make-Rproto =20 diff --git a/TESTS b/doc/automake_migration_tests.txt similarity index 100% rename from TESTS rename to doc/automake_migration_tests.txt diff --git a/doc/doc.am b/doc/doc.am index 4ff793e..eb21159 100644 --- a/doc/doc.am +++ b/doc/doc.am @@ -56,6 +56,8 @@ else EXTRA_DIST +=3D $(DOCFILES) endif =20 +EXTRA_DIST +=3D doc/automake_migration_tests.txt + # pdf doc, written in mom and therefore using contrib/mom/mom.am # definitions EXTRA_DIST +=3D doc/automake.mom From MAILER-DAEMON Wed Feb 28 00:17:23 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1equ7H-00083B-8M for mharc-groff-commit@gnu.org; Wed, 28 Feb 2018 00:17:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1equ7E-000817-IL for groff-commit@gnu.org; Wed, 28 Feb 2018 00:17:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1equ7D-0005XY-Nb for groff-commit@gnu.org; Wed, 28 Feb 2018 00:17:20 -0500 Received: from vcs0.savannah.gnu.org ([208.118.235.201]:52892) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1equ7D-0005XU-JQ for groff-commit@gnu.org; Wed, 28 Feb 2018 00:17:19 -0500 Received: by vcs0.savannah.gnu.org (Postfix, from userid 65722) id 4840E207B1; Wed, 28 Feb 2018 00:17:19 -0500 (EST) To: groff-commit@gnu.org Subject: [groff] 01/01: Don't use `//' comments in C files. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Reply-To: Werner Lemberg In-Reply-To: groff@gnu.org References: <20180228051718.28072.63304@vcs0.savannah.gnu.org> X-Git-Repo: groff X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: b0afc87e4bc0296de3cb1eb7ba2324b5f5348f5c Auto-Submitted: auto-generated Message-Id: <20180228051719.4840E207B1@vcs0.savannah.gnu.org> Date: Wed, 28 Feb 2018 00:17:18 -0500 (EST) From: wl@gnu.org (Werner LEMBERG) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.201 X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Feb 2018 05:17:21 -0000 wl pushed a commit to branch master in repository groff. commit b0afc87e4bc0296de3cb1eb7ba2324b5f5348f5c Author: Werner Lemberg Date: Wed Feb 28 06:10:30 2018 +0100 Don't use `//' comments in C files. --- src/devices/xditview/draw.c | 4 ++-- src/devices/xditview/font.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/devices/xditview/draw.c b/src/devices/xditview/draw.c index f529801..6126179 100644 --- a/src/devices/xditview/draw.c +++ b/src/devices/xditview/draw.c @@ -34,7 +34,7 @@ static int FakeCharacter(DviWidget, char *, int); /* font.c */ extern int MaxFontPosition(DviWidget); =20 -// shadowed by a macro definition in parse.c, and unused elsewhere +/* shadowed by a macro definition in parse.c, and unused elsewhere */ #if 0 static void HorizontalMove(DviWidget dw, int delta) @@ -389,7 +389,7 @@ PutNumberedCharacter (DviWidget dw, int c) } } =20 -// unused +/* unused */ #if 0 static void ClearPage (DviWidget dw) diff --git a/src/devices/xditview/font.c b/src/devices/xditview/font.c index 0958cd5..97eb46e 100644 --- a/src/devices/xditview/font.c +++ b/src/devices/xditview/font.c @@ -15,7 +15,7 @@ #include "XFontName.h" #include "font.h" =20 -// forward reference +/* forward reference */ static void DisposeFontSizes(DviWidget, DviFontSizeList *); =20 static char * From MAILER-DAEMON Wed Feb 28 07:21:37 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1er0jp-00036S-E9 for mharc-groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er0jm-000346-BI for groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1er0jl-00041A-Ai for groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:34 -0500 Received: from vcs0.savannah.gnu.org ([208.118.235.201]:57772) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er0jl-00040p-6i for groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:33 -0500 Received: by vcs0.savannah.gnu.org (Postfix, from userid 65722) id 1BE9B20B6E; Wed, 28 Feb 2018 07:21:33 -0500 (EST) To: groff-commit@gnu.org Subject: [groff] 02/05: Minor compilation warnings. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Reply-To: Werner Lemberg In-Reply-To: groff@gnu.org References: <20180228122132.7703.38195@vcs0.savannah.gnu.org> X-Git-Repo: groff X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: b8c12a5a314b90bc12aeaa0ddd40f73b0bcef868 Auto-Submitted: auto-generated Message-Id: <20180228122133.1BE9B20B6E@vcs0.savannah.gnu.org> Date: Wed, 28 Feb 2018 07:21:33 -0500 (EST) From: wl@gnu.org (Werner LEMBERG) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.201 X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Feb 2018 12:21:35 -0000 wl pushed a commit to branch master in repository groff. commit b8c12a5a314b90bc12aeaa0ddd40f73b0bcef868 Author: Werner Lemberg Date: Wed Feb 28 06:43:09 2018 +0100 Minor compilation warnings. =20 * src/devices/xditview/draw.c: Don't declare `MaxFontPosition'. =20 * src/roff/troff/input.cpp (psbb_locator::context_args): Avoid shadowing of `buf'. --- ChangeLog | 9 +++++++++ src/devices/xditview/draw.c | 3 --- src/roff/troff/input.cpp | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e03001..476f169 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2018-02-28 Werner LEMBERG =20 + Minor compilation warnings. + + * src/devices/xditview/draw.c: Don't declare `MaxFontPosition'. + + * src/roff/troff/input.cpp (psbb_locator::context_args): Avoid + shadowing of `buf'. + +2018-02-28 Werner LEMBERG + * src/roff/troff/env.cpp: s/HYPHEN_/HYPHEN_NOT/ for clarification. =20 2018-02-26 Bertrand Garrigues diff --git a/src/devices/xditview/draw.c b/src/devices/xditview/draw.c index 6126179..288d98a 100644 --- a/src/devices/xditview/draw.c +++ b/src/devices/xditview/draw.c @@ -31,9 +31,6 @@ /* forward reference */ static int FakeCharacter(DviWidget, char *, int); =20 -/* font.c */ -extern int MaxFontPosition(DviWidget); - /* shadowed by a macro definition in parse.c, and unused elsewhere */ #if 0 static void diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp index 8a5041d..6df9c31 100644 --- a/src/roff/troff/input.cpp +++ b/src/roff/troff/input.cpp @@ -6273,16 +6273,16 @@ inline const char *psbb_locator::context_args(con= st char *tag) // // Inputs: // tag literal text to be matched at start of buffer -// buf pointer to text to be checked for "tag" match +// p pointer to text to be checked for "tag" match // // Returns a pointer to the trailing substring of the specified // text buffer, following an initial substring matching the "tag" // argument, or NULL if "tag" is not matched. // -inline const char *psbb_locator::context_args(const char *tag, const cha= r *buf) +inline const char *psbb_locator::context_args(const char *tag, const cha= r *p) { size_t len =3D strlen(tag); - return (strncmp(tag, buf, len) =3D=3D 0) ? buf + len : NULL; + return (strncmp(tag, p, len) =3D=3D 0) ? p + len : NULL; } =20 // psbb_locator::bounding_box_args() From MAILER-DAEMON Wed Feb 28 07:21:39 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1er0jr-00038e-OR for mharc-groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er0jm-000347-CL for groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1er0jl-000415-AU for groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:34 -0500 Received: from vcs0.savannah.gnu.org ([208.118.235.201]:57770) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er0jl-00040a-6K for groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:33 -0500 Received: by vcs0.savannah.gnu.org (Postfix, from userid 65722) id EBDA920AF5; Wed, 28 Feb 2018 07:21:32 -0500 (EST) To: groff-commit@gnu.org Subject: [groff] 01/05: * src/roff/troff/env.cpp: s/HYPHEN_/HYPHEN_NOT/ for clarification. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Reply-To: Werner Lemberg In-Reply-To: groff@gnu.org References: <20180228122132.7703.38195@vcs0.savannah.gnu.org> X-Git-Repo: groff X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 80043ff6168a9344f6113256f55aacf33bd8c4ee Auto-Submitted: auto-generated Message-Id: <20180228122132.EBDA920AF5@vcs0.savannah.gnu.org> Date: Wed, 28 Feb 2018 07:21:32 -0500 (EST) From: wl@gnu.org (Werner LEMBERG) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.201 X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Feb 2018 12:21:35 -0000 wl pushed a commit to branch master in repository groff. commit 80043ff6168a9344f6113256f55aacf33bd8c4ee Author: Werner Lemberg Date: Wed Feb 28 06:25:36 2018 +0100 * src/roff/troff/env.cpp: s/HYPHEN_/HYPHEN_NOT/ for clarification. --- ChangeLog | 4 ++++ src/roff/troff/env.cpp | 22 +++++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 943c015..5e03001 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2018-02-28 Werner LEMBERG + + * src/roff/troff/env.cpp: s/HYPHEN_/HYPHEN_NOT/ for clarification. + 2018-02-26 Bertrand Garrigues =20 Update installation doc. diff --git a/src/roff/troff/env.cpp b/src/roff/troff/env.cpp index dc83366..518af2e 100644 --- a/src/roff/troff/env.cpp +++ b/src/roff/troff/env.cpp @@ -38,7 +38,11 @@ symbol default_family("T"); =20 enum { ADJUST_LEFT =3D 0, ADJUST_BOTH =3D 1, ADJUST_CENTER =3D 3, ADJUST= _RIGHT =3D 5 }; =20 -enum { HYPHEN_LAST_LINE =3D 2, HYPHEN_LAST_CHARS =3D 4, HYPHEN_FIRST_CHA= RS =3D 8 }; +enum { + HYPHEN_NOT_LAST_LINE =3D 2, + HYPHEN_NOT_LAST_CHARS =3D 4, + HYPHEN_NOT_FIRST_CHARS =3D 8 +}; =20 struct env_list { environment *env; @@ -2020,12 +2024,12 @@ void environment::hyphenate_line(int start_here) if (hyphenation_flags !=3D 0 && !inhibit // this may not be right if we have extra space on this line - && !((hyphenation_flags & HYPHEN_LAST_LINE) + && !((hyphenation_flags & HYPHEN_NOT_LAST_LINE) && (curdiv->distance_to_next_trap() <=3D vertical_spacing + total_post_vertical_spacing())) && i >=3D (2 - + (hyphenation_flags & HYPHEN_FIRST_CHARS ? 1 : 0) - + (hyphenation_flags & HYPHEN_LAST_CHARS ? 1 : 0))) + + (hyphenation_flags & HYPHEN_NOT_FIRST_CHARS ? 1 : 0) + + (hyphenation_flags & HYPHEN_NOT_LAST_CHARS ? 1 : 0))) hyphenate(sl, hyphenation_flags); while (forward !=3D 0) { node *tem1 =3D forward; @@ -3304,11 +3308,11 @@ void environment::print_env() errprint(" lines not to enumerate: %1\n", no_number_count); } string hf =3D hyphenation_flags ? "on" : "off"; - if (hyphenation_flags & HYPHEN_LAST_LINE) + if (hyphenation_flags & HYPHEN_NOT_LAST_LINE) hf +=3D ", not last line"; - if (hyphenation_flags & HYPHEN_LAST_CHARS) + if (hyphenation_flags & HYPHEN_NOT_LAST_CHARS) hf +=3D ", not last two chars"; - if (hyphenation_flags & HYPHEN_FIRST_CHARS) + if (hyphenation_flags & HYPHEN_NOT_FIRST_CHARS) hf +=3D ", not first two chars"; hf +=3D '\0'; errprint(" hyphenation_flags: %1\n", hf.contents()); @@ -3967,9 +3971,9 @@ void hyphenate(hyphen_list *h, unsigned flags) int num[WORD_MAX + 3]; current_language->patterns.hyphenate(hbuf, len + 2, num); int i; - if (flags & HYPHEN_FIRST_CHARS) + if (flags & HYPHEN_NOT_FIRST_CHARS) num[2] =3D 0; - if (flags & HYPHEN_LAST_CHARS) + if (flags & HYPHEN_NOT_LAST_CHARS) --len; for (i =3D 2, tem =3D h; i < len && tem; tem =3D tem->next, i++) if (num[i] & 1) From MAILER-DAEMON Wed Feb 28 07:21:40 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1er0jr-00038v-VZ for mharc-groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34017) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er0jm-00034f-TU for groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1er0jm-00042S-0j for groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:34 -0500 Received: from vcs0.savannah.gnu.org ([208.118.235.201]:57774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er0jl-00042M-Sx for groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:33 -0500 Received: by vcs0.savannah.gnu.org (Postfix, from userid 65722) id CC22B20AF5; Wed, 28 Feb 2018 07:21:33 -0500 (EST) To: groff-commit@gnu.org Subject: [groff] 03/05: * configure.ac: Activate silent Makefile rules. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Reply-To: Werner Lemberg In-Reply-To: groff@gnu.org References: <20180228122132.7703.38195@vcs0.savannah.gnu.org> X-Git-Repo: groff X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 458891a439b521d53383b91ff6b956b0322afc7c Auto-Submitted: auto-generated Message-Id: <20180228122133.CC22B20AF5@vcs0.savannah.gnu.org> Date: Wed, 28 Feb 2018 07:21:33 -0500 (EST) From: wl@gnu.org (Werner LEMBERG) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.201 X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Feb 2018 12:21:36 -0000 wl pushed a commit to branch master in repository groff. commit 458891a439b521d53383b91ff6b956b0322afc7c Author: Werner Lemberg Date: Wed Feb 28 06:46:32 2018 +0100 * configure.ac: Activate silent Makefile rules. --- ChangeLog | 4 ++++ configure.ac | 2 ++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 476f169..8759213 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2018-02-28 Werner LEMBERG =20 + * configure.ac: Activate silent Makefile rules. + +2018-02-28 Werner LEMBERG + Minor compilation warnings. =20 * src/devices/xditview/draw.c: Don't declare `MaxFontPosition'. diff --git a/configure.ac b/configure.ac index bf46a4e..f3c4dd0 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,8 @@ AC_USE_SYSTEM_EXTENSIONS =20 AM_INIT_AUTOMAKE([subdir-objects]) =20 +AM_SILENT_RULES([yes]) + # checks for programs AC_PROG_CC AC_PROG_CXX From MAILER-DAEMON Wed Feb 28 07:21:41 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1er0jt-0003AB-AM for mharc-groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er0jp-00036K-9a for groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1er0jm-00043d-DO for groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:37 -0500 Received: from vcs0.savannah.gnu.org ([208.118.235.201]:57778) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er0jm-00043M-A6 for groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:34 -0500 Received: by vcs0.savannah.gnu.org (Postfix, from userid 65722) id 3C0E820AF5; Wed, 28 Feb 2018 07:21:34 -0500 (EST) To: groff-commit@gnu.org Subject: [groff] 05/05: Use $(GROFF_V) to silence documentation creation. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Reply-To: Werner Lemberg In-Reply-To: groff@gnu.org References: <20180228122132.7703.38195@vcs0.savannah.gnu.org> X-Git-Repo: groff X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 167ddb60b4244da8bb9acdfe7ce7777fd4fd6c8a Auto-Submitted: auto-generated Message-Id: <20180228122134.3C0E820AF5@vcs0.savannah.gnu.org> Date: Wed, 28 Feb 2018 07:21:34 -0500 (EST) From: wl@gnu.org (Werner LEMBERG) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.201 X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Feb 2018 12:21:39 -0000 wl pushed a commit to branch master in repository groff. commit 167ddb60b4244da8bb9acdfe7ce7777fd4fd6c8a Author: Werner Lemberg Date: Wed Feb 28 13:12:38 2018 +0100 Use $(GROFF_V) to silence documentation creation. --- ChangeLog | 9 +++++++++ Makefile.am | 5 +++++ contrib/hdtbl/ChangeLog | 4 ++++ contrib/hdtbl/hdtbl.am | 14 ++++++++------ contrib/mom/ChangeLog | 6 +++++- contrib/mom/mom.am | 4 ++-- contrib/pdfmark/ChangeLog | 4 ++++ contrib/pdfmark/pdfmark.am | 6 +++--- doc/doc.am | 42 +++++++++++++++++++++-------------------= -- 9 files changed, 61 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index c503fd3..6d94e7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2018-02-28 Werner LEMBERG =20 + Use $(GROFF_V) to silence documentation creation. + + * Makefile.am (GROFF_V): Define. + + * doc/doc.am (.me.txt, .me.ps, .ms.html, .ms.txt, .ms.ps, pic.html, + webpage.html): Use $(GROFF_V). + +2018-02-28 Werner LEMBERG + Use $(AM_V_GEN) to silence file generation. =20 * Makefile.am (.man), contrib/eqn2graph/eqn2graph.am (eqn2graph), diff --git a/Makefile.am b/Makefile.am index c98ae22..e19924e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -539,6 +539,11 @@ AM_CPPFLAGS =3D \ -I$(top_builddir)/src/include \ -I$(top_builddir)/lib =20 +# Define a custom string for rules that call groff in make's silence mod= e. +GROFF_V =3D $(GROFF_V_@AM_V@) +GROFF_V_ =3D $(GROFF_V_@AM_DEFAULT_V@) +GROFF_V_0 =3D @echo " GROFF " $@; + # The following Automake variables will be overloaded by the various # .am files bin_PROGRAMS =3D diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog index a411507..5e5c77f 100644 --- a/contrib/hdtbl/ChangeLog +++ b/contrib/hdtbl/ChangeLog @@ -1,3 +1,7 @@ +2018-02-28 Werner LEMBERG + + * hdtbl.am (.roff.ps, .in.roff): Use $(GROFF_V) and $(AM_V_GEN). + 2015-08-22 Bernd Warken =20 * groff_hdtbl.7.man: Rename `groff_hdtbl.man'. diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am index f942d33..574a4e9 100644 --- a/contrib/hdtbl/hdtbl.am +++ b/contrib/hdtbl/hdtbl.am @@ -105,13 +105,15 @@ EXTRA_DIST +=3D \ SUFFIXES +=3D .roff .in .ps =20 .roff.ps: - @$(MKDIR_P) `dirname $@` - $(HDTBLGROFF) -Tps -dfontpath=3D$(top_srcdir)/font -dsopath=3D$(hdtbl_s= rcdir)/ \ - -mhdtbl $< >$@ + $(GROFF_V)$(MKDIR_P) `dirname $@` \ + && $(HDTBLGROFF) -Tps \ + -dfontpath=3D$(top_srcdir)/font \ + -dsopath=3D$(hdtbl_srcdir)/ \ + -mhdtbl $< >$@ .in.roff: - @$(MKDIR_P) `dirname $@` - sed -e "s|[@]fontdir[@]|$(fontdir)|" \ - -e "s|[@]EGREP[@]|$(EGREP)|" $< >$@ + $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ + && sed -e "s|[@]fontdir[@]|$(fontdir)|" \ + -e "s|[@]EGREP[@]|$(EGREP)|" $< >$@ =20 =20 $(HDTBLPROCESSEDEXAMPLEFILES): gnu.eps groff troff pic tbl \ diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog index 6589364..2a3459b 100644 --- a/contrib/mom/ChangeLog +++ b/contrib/mom/ChangeLog @@ -1,6 +1,10 @@ +2018-02-28 Werner LEMBERG + + * mom.am (.mom.pdf): Use $(GROFF_V). + 2017-11-04 G. Branden Robinson =20 - mom.am: Drop unnecessary -M flag; build tree has what it needs. + * mom.am: Drop unnecessary -M flag; build tree has what it needs. =20 2017-10-29 Bjarni Ingi Gislason =20 diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am index 68389dd..0f98137 100644 --- a/contrib/mom/mom.am +++ b/contrib/mom/mom.am @@ -131,8 +131,8 @@ MOSTLYCLEANFILES +=3D \ # Rule to generated .pdf files from .mom files SUFFIXES +=3D .mom .pdf .mom.pdf: - @$(MKDIR_P) `dirname $@` - LC_ALL=3DC $(MOMPDFMOM) $< >$@ + $(GROFF_V)$(MKDIR_P) `dirname $@` \ + && LC_ALL=3DC $(MOMPDFMOM) $< >$@ =20 $(MOMPROCESSEDEXAMPLEFILES): $(MOMSTRIPFILES) $(MOMNORMALFILES) \ groff troff gropdf pdfmom penguin.ps penguin.pdf \ diff --git a/contrib/pdfmark/ChangeLog b/contrib/pdfmark/ChangeLog index 4d2b175..182258b 100644 --- a/contrib/pdfmark/ChangeLog +++ b/contrib/pdfmark/ChangeLog @@ -1,5 +1,9 @@ 2018-02-28 Werner LEMBERG =20 + * pdfmark.am (pdfmark.pdf): Use $(GROFF_V). + +2018-02-28 Werner LEMBERG + * pdfmark.am (pdfroff): Use $(AM_V_GEN) to silence file generation. =20 2015-08-22 Bernd Warken diff --git a/contrib/pdfmark/pdfmark.am b/contrib/pdfmark/pdfmark.am index d9589bc..75e9b62 100644 --- a/contrib/pdfmark/pdfmark.am +++ b/contrib/pdfmark/pdfmark.am @@ -66,9 +66,9 @@ PDFROFF=3D\ $(FFLAG) $(TFLAG) $(PDFMARK_TFLAG) $(PDFMARK_PFLAG) =20 contrib/pdfmark/pdfmark.pdf: contrib/pdfmark/pdfmark.ms - @$(MKDIR_P) `dirname $@` - $(PDFROFF) -mspdf --stylesheet=3D$(pdfmark_srcdir)/cover.ms \ - $(top_srcdir)/contrib/pdfmark/pdfmark.ms >$@ + $(GROFF_V)$(MKDIR_P) `dirname $@` \ + && $(PDFROFF) -mspdf --stylesheet=3D$(pdfmark_srcdir)/cover.ms \ + $(top_srcdir)/contrib/pdfmark/pdfmark.ms >$@ =20 # The pdf files use the local script to generate. $(PDFDOCFILES): pdfroff groff troff gropdf=20 diff --git a/doc/doc.am b/doc/doc.am index eb21159..86dbd21 100644 --- a/doc/doc.am +++ b/doc/doc.am @@ -127,22 +127,22 @@ SUFFIXES +=3D .me .ms .ps .html .txt .texi .dvi .pd= f .xhtml =20 # For simplicity, we always call preconv, grn, and eqn. .me.txt: - @$(MKDIR_P) `dirname $@` - $(DOC_GROFF) -k -Tutf8 -ge -me >$@ + $(GROFF_V)$(MKDIR_P) `dirname $@` \ + && $(DOC_GROFF) -k -Tutf8 -ge -me >$@ .me.ps: - @$(MKDIR_P) `dirname $@` - $(DOC_GROFF) -k -Tps -ge -me >$@ + $(GROFF_V)$(MKDIR_P) `dirname $@` \ + && $(DOC_GROFF) -k -Tps -ge -me >$@ =20 .ms.html: - @$(MKDIR_P) `dirname $@` - $(DOC_GROFF) -P-p -P-b -P-I`basename $< | sed -e 's|.ms$$||'` \ - -P-D$(imagedir) -P-V -Thtml -ms >$@ + $(GROFF_V)$(MKDIR_P) `dirname $@` \ + && $(DOC_GROFF) -P-p -P-b -P-I`basename $< | sed -e 's|.ms$$||'` \ + -P-D$(imagedir) -P-V -Thtml -ms >$@ .ms.txt: - @$(MKDIR_P) `dirname $@` - $(DOC_GROFF) -Tascii -ms -mwww >$@ + $(GROFF_V)$(MKDIR_P) `dirname $@` \ + && $(DOC_GROFF) -Tascii -ms -mwww >$@ .ms.ps: - @$(MKDIR_P) `dirname $@` - $(DOC_GROFF) -Tps -ms -mwww >$@ + $(GROFF_V)$(MKDIR_P) `dirname $@` \ + && $(DOC_GROFF) -Tps -ms -mwww >$@ =20 $(PROCESSEDEXAMPLEFILES): $(bin_PROGRAMS) $(prefixexecbin_PROGRAMS) gnu.= eps $(PROCESSEDEXAMPLEFILES): $(dist_devpsfont_DATA) $(nodist_devpsfont_DATA= ) $(hdtbltmac_DATA) @@ -154,11 +154,11 @@ doc/pic.html: $(bin_PROGRAMS) $(prefixexecbin_PROGR= AMS) doc/pic.html: doc/examples.stamp doc/pic.html: $(dist_devpsfont_DATA) $(nodist_devpsfont_DATA) doc/pic.html: $(doc_srcdir)/pic.ms $(devhtmlfont_DATA) - @$(MKDIR_P) $(doc_builddir) - cd $(doc_builddir) && \ - $(DOC_SED) $(doc_srcdir)/pic.ms | \ - $(DOC_GROFF_ONLY) -P-p -P-Ipic -P-D$(imagedir) -P-jpic \ - -Thtml -P-V -ms > pic.html + $(GROFF_V)$(MKDIR_P) $(doc_builddir) \ + && cd $(doc_builddir) \ + && $(DOC_SED) $(doc_srcdir)/pic.ms \ + | $(DOC_GROFF_ONLY) -P-p -P-Ipic -P-D$(imagedir) -P-jpic \ + -Thtml -P-V -ms > pic.html =20 doc/examples.stamp: doc/groff.css @$(MKDIR_P) $(doc_builddir) @@ -169,11 +169,11 @@ doc/webpage.html: $(bin_PROGRAMS) $(prefixexecbin_P= ROGRAMS) doc/webpage.html: doc/examples.stamp $(devhtmlfont_DATA) doc/webpage.html: $(dist_devpsfont_DATA) $(nodist_devpsfont_DATA)=20 doc/webpage.html: $(doc_srcdir)/webpage.ms gnu.eps $(doc_srcdir)/groff.c= ss - @$(MKDIR_P) doc - cd $(doc_builddir) && \ - $(DOC_SED) $(doc_srcdir)/webpage.ms | \ - $(DOC_GROFF_ONLY) -P-jwebpage -P-nrpb -P-Iwebpage \ - -P-D$(imagedir) -Thtml -ms > webpage.html + $(GROFF_V)$(MKDIR_P) doc \ + && cd $(doc_builddir) \ + && $(DOC_SED) $(doc_srcdir)/webpage.ms \ + | $(DOC_GROFF_ONLY) -P-jwebpage -P-nrpb -P-Iwebpage \ + -P-D$(imagedir) -Thtml -ms > webpage.html =20 doc/grnexmpl.ps: doc/grnexmpl.me doc/grnexmpl.g =20 From MAILER-DAEMON Wed Feb 28 07:21:45 2018 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1er0jx-0003Bz-JW for mharc-groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34047) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er0jq-00037W-EL for groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1er0jm-000436-78 for groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:38 -0500 Received: from vcs0.savannah.gnu.org ([208.118.235.201]:57776) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er0jm-00042r-2z for groff-commit@gnu.org; Wed, 28 Feb 2018 07:21:34 -0500 Received: by vcs0.savannah.gnu.org (Postfix, from userid 65722) id 083D220AF5; Wed, 28 Feb 2018 07:21:34 -0500 (EST) To: groff-commit@gnu.org Subject: [groff] 04/05: Use $(AM_V_GEN) to silence file generation. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Reply-To: Werner Lemberg In-Reply-To: groff@gnu.org References: <20180228122132.7703.38195@vcs0.savannah.gnu.org> X-Git-Repo: groff X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 6b56ce7c455c5a3ca5024a05870a122966be0ee3 Auto-Submitted: auto-generated Message-Id: <20180228122134.083D220AF5@vcs0.savannah.gnu.org> Date: Wed, 28 Feb 2018 07:21:33 -0500 (EST) From: wl@gnu.org (Werner LEMBERG) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.201 X-BeenThere: groff-commit@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Feb 2018 12:21:42 -0000 wl pushed a commit to branch master in repository groff. commit 6b56ce7c455c5a3ca5024a05870a122966be0ee3 Author: Werner Lemberg Date: Wed Feb 28 10:54:37 2018 +0100 Use $(AM_V_GEN) to silence file generation. --- ChangeLog | 18 ++++++++++++++++++ Makefile.am | 10 +++++----- contrib/chem/ChangeLog | 4 ++++ contrib/chem/chem.am | 33 +++++++++++++++++---------------- contrib/eqn2graph/eqn2graph.am | 7 ++++--- contrib/gdiffmk/ChangeLog | 4 ++++ contrib/gdiffmk/gdiffmk.am | 7 ++++--- contrib/glilypond/ChangeLog | 6 +++++- contrib/glilypond/glilypond.am | 17 +++++++++-------- contrib/gperl/ChangeLog | 4 ++++ contrib/gperl/gperl.am | 18 ++++++++++-------- contrib/gpinyin/ChangeLog | 4 ++++ contrib/gpinyin/gpinyin.am | 9 +++++---- contrib/grap2graph/grap2graph.am | 8 +++++--- contrib/groffer/ChangeLog | 4 ++++ contrib/groffer/groffer.am | 18 ++++++++++-------- contrib/mm/ChangeLog | 4 ++++ contrib/mm/mm.am | 6 ++++-- contrib/pdfmark/ChangeLog | 4 ++++ contrib/pdfmark/pdfmark.am | 7 ++++--- contrib/pic2graph/pic2graph.am | 8 +++++--- font/devascii/devascii.am | 18 ++++++++---------- font/devcp1047/devcp1047.am | 18 ++++++++---------- font/devdvi/devdvi.am | 18 +++++++++--------- font/devhtml/devhtml.am | 18 ++++++++---------- font/devlatin1/devlatin1.am | 18 ++++++++---------- font/devlbp/devlbp.am | 18 +++++++++--------- font/devlj4/devlj4.am | 22 +++++++++++----------- font/devps/devps.am | 37 +++++++++++++++++++---------------= --- font/devutf8/devutf8.am | 16 +++++++--------- src/devices/gropdf/gropdf.am | 28 +++++++++++++++------------- src/preproc/eqn/eqn.am | 12 +++++++----- src/roff/grog/grog.am | 25 +++++++++++++------------ src/roff/nroff/nroff.am | 12 +++++++----- src/utils/afmtodit/afmtodit.am | 12 +++++++----- 35 files changed, 269 insertions(+), 203 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8759213..c503fd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,23 @@ 2018-02-28 Werner LEMBERG =20 + Use $(AM_V_GEN) to silence file generation. + + * Makefile.am (.man), contrib/eqn2graph/eqn2graph.am (eqn2graph), + contrib/grap2graph/grap2graph.am (grap2graph), contrib/pic2graph.am + (pic2graph), src/devices/gropdf/gropdf.am (gropdf, pdfmom), + src/preproc/eqn/eqn.am (neqn), src/roff/grog/grog.am (grog), + src/roff/nroff/nroff.am (nroff), src/utils/afmtodit/afmtodit.am + (afmtodit), font/devascii/devascii.am (DEVASCIIFONTSFILES, DESC), + font/devcp1047/devcp1047.am (DEVCP1047FONTSFILES, DESC), + font/devhtml/devhtml.am (DEVHTMLFONTSFILES, DESC), + font/devlatin1/devlatin1.am (DEVLATIN1FONTSFILES, DESC), + font/devutf8/devutf8.am (DEVUTF8FONTSFILES, DESC), + font/devps/devps.am (DESC, prologue, zapfdr.pfa, symbolsl.pfa), + font/devdvi/devdvi.am (DESC), font/devlbp/devlbp.am (DESC), + font/devlj4/devlj4.am (DESC): Do it. + +2018-02-28 Werner LEMBERG + * configure.ac: Activate silent Makefile rules. =20 2018-02-28 Werner LEMBERG diff --git a/Makefile.am b/Makefile.am index 7dcdbaa..c98ae22 100644 --- a/Makefile.am +++ b/Makefile.am @@ -883,10 +883,9 @@ MOSTLYCLEANFILES +=3D $(prefixexecbin_SCRIPTS) $(bin= _SCRIPTS) \ # substitution of the variable by automake. SUFFIXES +=3D .man .man: - @echo Making $@ from $< - rm -f $@ - $(MKDIR_P) `dirname $@` - @LC_ALL=3DC \ + $(AM_V_GEN)rm -f $@ \ + && $(MKDIR_P) `dirname $@` \ + && LC_ALL=3DC \ sed -e "s|[@]APPRESDIR[@]|$(appresdir)|g" \ -e "s|[@]BINDIR[@]|$(bindir)|g" \ -e "s|[@]BROKEN_SPOOLER_FLAGS[@]|$(BROKEN_SPOOLER_FLAGS)|g" \ @@ -918,7 +917,8 @@ SUFFIXES +=3D .man -e "s|[@]TMAC_MDIR[@]|$(tmacdir)/mm|g" \ -e "s|[@]TMAC_S_PREFIX[@]|$(tmac_s_prefix)|g" \ -e "s|[@]VERSION[@]|$(VERSION)|g" \ - $< >$@ + $< \ + >$@ =20 # Version files - see script 'build-aux/git-gen-version' EXTRA_DIST +=3D $(top_srcdir)/.version diff --git a/contrib/chem/ChangeLog b/contrib/chem/ChangeLog index d64b1c2..64d62a0 100644 --- a/contrib/chem/ChangeLog +++ b/contrib/chem/ChangeLog @@ -1,3 +1,7 @@ +2018-02-28 Werner LEMBERG + + * chem.am (chem, README): Use $(AM_V_GEN) to silence file generation. + 2015-08-22 Bernd Warken =20 * chem.1.man: Rename `chem.man'. diff --git a/contrib/chem/chem.am b/contrib/chem/chem.am index 4966294..c6754f4 100644 --- a/contrib/chem/chem.am +++ b/contrib/chem/chem.am @@ -71,28 +71,29 @@ MOSTLYCLEANFILES +=3D $(CHEM_GENEXAMPLES) $(nodist_ch= emexample122_DATA) \ all: contrib/chem/README =20 contrib/chem/README: $(chem_srcdir)/README.txt - @$(MKDIR_P) contrib/chem/ - sed -e "s|[@]g[@]|$(g)|g" $? >$@ + $(AM_V_GEN)$(MKDIR_P) contrib/chem/ \ + && sed -e "s|[@]g[@]|$(g)|g" $? >$@ =20 contrib/chem/examples/README: $(chem_srcdir)/examples/README.txt - @$(MKDIR_P) contrib/chem/examples - sed -e "s|[@]g[@]|$(g)|g" $? >$@ + $(AM_V_GEN)$(MKDIR_P) contrib/chem/examples \ + && sed -e "s|[@]g[@]|$(g)|g" $? >$@ =20 contrib/chem/examples/122/README: $(chem_srcdir)/examples/122/README.txt - @$(MKDIR_P) contrib/chem/examples/122 - sed -e "s|[@]g[@]|$(g)|g" $? >$@ + $(AM_V_GEN)$(MKDIR_P) contrib/chem/examples/122 \ + && sed -e "s|[@]g[@]|$(g)|g" $? >$@ =20 chem: $(chem_srcdir)/chem.pl $(SH_DEPS_SED_SCRIPT) - $(RM) $@ - sed -f "$(SH_DEPS_SED_SCRIPT)" \ - -e "s|[@]g[@]|$(g)|g" \ - -e "s|[@]BINDIR[@]|$(DESTDIR)$(bindir)|g" \ - -e "s|[@]MACRODIR[@]|$(DESTDIR)$(tmacdir)|g" \ - -e "s|[@]PICDIR[@]|$(DESTDIR)$(datasubdir)/pic|g" \ - -e "s|[@]VERSION[@]|$(VERSION)|g" \ - -e "$(SH_SCRIPT_SED_CMD)" \ - $(chem_srcdir)/chem.pl >$@ - chmod +x $@ + $(AM_V_GEN)$(RM) $@ \ + && sed -f "$(SH_DEPS_SED_SCRIPT)" \ + -e "s|[@]g[@]|$(g)|g" \ + -e "s|[@]BINDIR[@]|$(DESTDIR)$(bindir)|g" \ + -e "s|[@]MACRODIR[@]|$(DESTDIR)$(tmacdir)|g" \ + -e "s|[@]PICDIR[@]|$(DESTDIR)$(datasubdir)/pic|g" \ + -e "s|[@]VERSION[@]|$(VERSION)|g" \ + -e "$(SH_SCRIPT_SED_CMD)" \ + $(chem_srcdir)/chem.pl \ + >$@ \ + && chmod +x $@ =20 install-data-local: install_chem_extra install_chem_extra: diff --git a/contrib/eqn2graph/eqn2graph.am b/contrib/eqn2graph/eqn2graph= .am index a5a33c1..75a506f 100644 --- a/contrib/eqn2graph/eqn2graph.am +++ b/contrib/eqn2graph/eqn2graph.am @@ -29,10 +29,11 @@ EXTRA_DIST +=3D \ contrib/eqn2graph/eqn2graph.sh =20 eqn2graph: $(top_srcdir)/contrib/eqn2graph/eqn2graph.sh - sed -e "s|[@]g[@]|$(g)|g" \ + $(AM_V_GEN)sed -e "s|[@]g[@]|$(g)|g" \ -e "s|[@]VERSION[@]|$(VERSION)|" \ - -e $(SH_SCRIPT_SED_CMD) $(eqn2graph_srcdir)/eqn2graph.sh >$@ - chmod +x $@ + -e $(SH_SCRIPT_SED_CMD) $(eqn2graph_srcdir)/eqn2graph.sh \ + >$@ \ + && chmod +x $@ =20 =20 ######################################################################## diff --git a/contrib/gdiffmk/ChangeLog b/contrib/gdiffmk/ChangeLog index bfaf4a5..5237cd4 100644 --- a/contrib/gdiffmk/ChangeLog +++ b/contrib/gdiffmk/ChangeLog @@ -1,3 +1,7 @@ +2018-02-28 Werner LEMBERG + + * gdiffmk.am (gdiffmk): Use $(AM_V_GEN) to silence file generation. + 2015-08-22 Bernd Warken =20 * gdiffmk.1.man: Rename `gdiffmk.man'. diff --git a/contrib/gdiffmk/gdiffmk.am b/contrib/gdiffmk/gdiffmk.am index ca1317a..36d604a 100644 --- a/contrib/gdiffmk/gdiffmk.am +++ b/contrib/gdiffmk/gdiffmk.am @@ -48,13 +48,14 @@ EXTRA_DIST +=3D \ contrib/gdiffmk/tests/file2 =20 gdiffmk: $(gdiffmk_srcdir)/gdiffmk.sh - sed -e "s|[@]BINDIR[@]|$(bindir)|g" \ + $(AM_V_GEN)sed -e "s|[@]BINDIR[@]|$(bindir)|g" \ -e "s|[@]VERSION[@]|$(VERSION)|g" \ -e "s|[@]HAVE_TEST_EF_OPTION[@]|$(HAVE_TEST_EF_OPTION)|g" \ -e "s|[@]BASH_PROG[@]|$(BASH_PROG)|g" \ -e "s|[@]DIFF_PROG[@]|$(DIFF_PROG)|g" \ - -e $(SH_SCRIPT_SED_CMD) $(gdiffmk_srcdir)/gdiffmk.sh >$@ - chmod +x $@ + -e $(SH_SCRIPT_SED_CMD) $(gdiffmk_srcdir)/gdiffmk.sh \ + >$@ \ + && chmod +x $@ =20 clean-local: clean_gdiffmk_check clean_gdiffmk_check: diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog index dc30577..fc54c92 100644 --- a/contrib/glilypond/ChangeLog +++ b/contrib/glilypond/ChangeLog @@ -1,6 +1,10 @@ +2018-02-28 Werner LEMBERG + + * glilypond.am (glilypond): Use $(AM_V_GEN) to silence file generation. + 2017-10-22 G. Branden Robinson =20 - args.pl: Fix grammar in usage message. + * args.pl: Fix grammar in usage message. =20 When used attributively, e.g. as an adjectival phrase, "command-line" should be hyphenated. diff --git a/contrib/glilypond/glilypond.am b/contrib/glilypond/glilypond= .am index 2e49fca..8fe51e0 100644 --- a/contrib/glilypond/glilypond.am +++ b/contrib/glilypond/glilypond.am @@ -49,14 +49,15 @@ EXTRA_DIST +=3D \ =20 # create perl executable 'glilypond', being stored into 'bindir' glilypond: $(glilypond_srcdir)/glilypond.pl shdeps.sed - $(RM) $@ - sed -f "$(SH_DEPS_SED_SCRIPT)" \ - -e "s|[@]g[@]|$(g)|g" \ - -e "s|[@]BINDIR[@]|$(DESTDIR)$(bindir)|g" \ - -e "s|[@]glilypond_dir[@]|$(DESTDIR)$(glilypond_dir)|g" \ - -e "s|[@]VERSION[@]|$(VERSION)|g" \ - $(glilypond_srcdir)/glilypond.pl >$@ - chmod +x $@ + $(AM_V_GEN)$(RM) $@ \ + && sed -f "$(SH_DEPS_SED_SCRIPT)" \ + -e "s|[@]g[@]|$(g)|g" \ + -e "s|[@]BINDIR[@]|$(DESTDIR)$(bindir)|g" \ + -e "s|[@]glilypond_dir[@]|$(DESTDIR)$(glilypond_dir)|g" \ + -e "s|[@]VERSION[@]|$(VERSION)|g" \ + $(glilypond_srcdir)/glilypond.pl \ + >$@ \ + && chmod +x $@ =20 uninstall_groffdirs: uninstall-glilypond-hook uninstall-glilypond-hook: diff --git a/contrib/gperl/ChangeLog b/contrib/gperl/ChangeLog index 6bba3d4..42e9273 100644 --- a/contrib/gperl/ChangeLog +++ b/contrib/gperl/ChangeLog @@ -1,3 +1,7 @@ +2018-02-28 Werner LEMBERG + + * gperl.am (gperl): Use $(AM_V_GEN) to silence file generation. + 2015-08-22 Bernd Warken =20 * gperl.1.man: Rename `gperl.man'. diff --git a/contrib/gperl/gperl.am b/contrib/gperl/gperl.am index bcee90b..846ed2e 100644 --- a/contrib/gperl/gperl.am +++ b/contrib/gperl/gperl.am @@ -32,15 +32,17 @@ EXTRA_DIST +=3D \ contrib/gperl/ChangeLog \ contrib/gperl/gperl.1.man \ contrib/gperl/gperl.pl + gperl: $(top_srcdir)/contrib/gperl/gperl.pl shdeps.sed - $(RM) $@ - sed -f "$(SH_DEPS_SED_SCRIPT)" \ - -e "s|[@]g[@]|$(g)|g" \ - -e "s|[@]BINDIR[@]|$(DESTDIR)$(bindir)|g" \ - -e "s|[@]VERSION[@]|$(VERSION)|g" \ - -e "$(SH_SCRIPT_SED_CMD)" \ - $(top_srcdir)/contrib/gperl/gperl.pl >$@; \ - chmod +x $@ + $(AM_V_GEN)$(RM) $@ \ + && sed -f "$(SH_DEPS_SED_SCRIPT)" \ + -e "s|[@]g[@]|$(g)|g" \ + -e "s|[@]BINDIR[@]|$(DESTDIR)$(bindir)|g" \ + -e "s|[@]VERSION[@]|$(VERSION)|g" \ + -e "$(SH_SCRIPT_SED_CMD)" \ + $(top_srcdir)/contrib/gperl/gperl.pl \ + >$@ \ + && chmod +x $@ =20 =20 ######################################################################## diff --git a/contrib/gpinyin/ChangeLog b/contrib/gpinyin/ChangeLog index e9a688e..4f46ddf 100644 --- a/contrib/gpinyin/ChangeLog +++ b/contrib/gpinyin/ChangeLog @@ -1,3 +1,7 @@ +2018-02-28 Werner LEMBERG + + * gpinyin.am (gpinyin): Use $(AM_V_GEN) to silence file generation. + 2015-08-22 Bernd Warken =20 * gpinyin.1.man: Rename `gpinyin.man'. diff --git a/contrib/gpinyin/gpinyin.am b/contrib/gpinyin/gpinyin.am index 95422ae..93799d7 100644 --- a/contrib/gpinyin/gpinyin.am +++ b/contrib/gpinyin/gpinyin.am @@ -38,14 +38,15 @@ EXTRA_DIST +=3D \ contrib/gpinyin/gpinyin.pl =20 gpinyin: contrib/gpinyin/gpinyin.pl - sed -f "$(SH_DEPS_SED_SCRIPT)" \ - -e "s|[@]g[@]|$(g)|g" \ + $(AM_V_GEN)sed -f "$(SH_DEPS_SED_SCRIPT)" \ + -e "s|[@]g[@]|$(g)|g" \ -e "s|[@]BINDIR[@]|$(DESTDIR)$(bindir)|g" \ -e "s|[@]gpinyin_dir[@]|$(DESTIR)$(gpinyin_dir)|" \ -e "s|[@]VERSION[@]|$(VERSION)|g" \ -e "$(SH_SCRIPT_SED_CMD)" \ - $(gpinyin_srcdir)/gpinyin.pl >$@; \ - chmod +x $@ + $(gpinyin_srcdir)/gpinyin.pl \ + >$@ \ + && chmod +x $@ =20 uninstall_groffdirs: uninstall-gpinyin-hook uninstall-gpinyin-hook: diff --git a/contrib/grap2graph/grap2graph.am b/contrib/grap2graph/grap2g= raph.am index daae76a..5d5dda4 100644 --- a/contrib/grap2graph/grap2graph.am +++ b/contrib/grap2graph/grap2graph.am @@ -26,11 +26,13 @@ man1_MANS +=3D contrib/grap2graph/grap2graph.1 EXTRA_DIST +=3D \ $(grap2graph_srcdir)/grap2graph.sh \ $(grap2graph_srcdir)/grap2graph.1.man + grap2graph: $(grap2graph_srcdir)/grap2graph.sh - sed -e "s|[@]g[@]|$(g)|g" \ + $(AM_V_GEN)sed -e "s|[@]g[@]|$(g)|g" \ -e "s|[@]VERSION[@]|$(VERSION)|" \ - -e $(SH_SCRIPT_SED_CMD) $(grap2graph_srcdir)/grap2graph.sh >$@ - chmod +x $@ + -e $(SH_SCRIPT_SED_CMD) $(grap2graph_srcdir)/grap2graph.sh \ + >$@ \ + && chmod +x $@ =20 =20 ######################################################################## diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog index 8e8e603..9087ea4 100644 --- a/contrib/groffer/ChangeLog +++ b/contrib/groffer/ChangeLog @@ -1,3 +1,7 @@ +2018-02-28 Werner LEMBERG + + * groffer.am (groffer): Use $(AM_V_GEN) to silence file generation. + 2015-08-27 Bernd Warken =20 * *.pl: Add device (mode) `xhtml'. diff --git a/contrib/groffer/groffer.am b/contrib/groffer/groffer.am index b62cf0e..d3c3600 100644 --- a/contrib/groffer/groffer.am +++ b/contrib/groffer/groffer.am @@ -80,26 +80,28 @@ man1_MANS +=3D \ MOSTLYCLEANFILES +=3D $(ROFF2MAN) =20 $(ROFF2PROGS): $(groffer_srcdir)/roff2.pl - cp $(groffer_srcdir)/roff2.pl $@; + cp $(groffer_srcdir)/roff2.pl $@ =20 # we take roff2.man and replace the @ROFF2MODE@ by the type of file # (dvi, pdf, html etc ...) $(ROFF2MAN): $(groffer_srcdir)/roff2.1.man - @$(MKDIR_P) contrib/groffer - FILEMODE=3D`echo $@ | sed 's|contrib/groffer/roff2\([a-z][a-z]*\)\.1\.m= an|\1|g'` \ - && sed -e 's/[@]ROFF2MODE[@]/'"$$FILEMODE"'/g' $(groffer_srcdir)/roff= 2.1.man > $@; + $(AM_V_GEN)$(MKDIR_P) contrib/groffer \ + && FILEMODE=3D`echo $@ | sed 's|contrib/groffer/roff2\([a-z][a-z]*\)\.1= \.man|\1|g'` \ + && sed -e 's/[@]ROFF2MODE[@]/'"$$FILEMODE"'/g' \ + $(groffer_srcdir)/roff2.1.man \ + > $@; =20 groffer: $(GROFFER_PERL) $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT) - echo "Using perl version of groffer."; \ - sed -f "$(SH_DEPS_SED_SCRIPT)" \ + $(AM_V_GEN)sed -f "$(SH_DEPS_SED_SCRIPT)" \ -e "s|[@]g[@]|$(g)|g" \ -e "s|[@]BINDIR[@]|$(DESTDIR)$(bindir)|g" \ -e "s|[@]libdir[@]|$(DESTDIR)$(libdir)|g" \ -e "s|[@]groffer_dir[@]|$(DESTDIR)$(groffer_dir)|g" \ -e "s|[@]VERSION[@]|$(VERSION)|g" \ -e "$(SH_SCRIPT_SED_CMD)" \ - $(groffer_srcdir)/groffer.pl >$@; \ - chmod +x $@; + $(groffer_srcdir)/groffer.pl \ + >$@ \ + && chmod +x $@; =20 uninstall_groffdirs: uninstall-groffer-hook uninstall-groffer-hook: diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog index 3bfb0b4..322ddbd 100644 --- a/contrib/mm/ChangeLog +++ b/contrib/mm/ChangeLog @@ -1,3 +1,7 @@ +2018-02-28 Werner LEMBERG + + * mm.am (mmroff): Use $(AM_V_GEN) to silence file generation. + 2017-11-02 G. Branden Robinson =20 examples/letter.mm: New; simple example of mm usage. diff --git a/contrib/mm/mm.am b/contrib/mm/mm.am index 42e16fd..d82ac93 100644 --- a/contrib/mm/mm.am +++ b/contrib/mm/mm.am @@ -70,8 +70,10 @@ EXTRA_DIST +=3D \ =20 =20 mmroff: $(mm_srcdir)/mmroff.pl - $(SED) -e 's;/usr/bin/perl;$(PERL);' $(mm_srcdir)/mmroff.pl >$@ - chmod +x $@ + $(AM_V_GEN)$(SED) -e 's;/usr/bin/perl;$(PERL);' \ + $(mm_srcdir)/mmroff.pl \ + >$@ \ + && chmod +x $@ =20 # Special installation rules for m.tmac, mse.tmac, mmse.tmac, mm.tmac # and MMLOCALE diff --git a/contrib/pdfmark/ChangeLog b/contrib/pdfmark/ChangeLog index ef130df..4d2b175 100644 --- a/contrib/pdfmark/ChangeLog +++ b/contrib/pdfmark/ChangeLog @@ -1,3 +1,7 @@ +2018-02-28 Werner LEMBERG + + * pdfmark.am (pdfroff): Use $(AM_V_GEN) to silence file generation. + 2015-08-22 Bernd Warken =20 * pdfroff.1.man: Rename `pdfroff.man'. diff --git a/contrib/pdfmark/pdfmark.am b/contrib/pdfmark/pdfmark.am index e965777..d9589bc 100644 --- a/contrib/pdfmark/pdfmark.am +++ b/contrib/pdfmark/pdfmark.am @@ -75,12 +75,13 @@ $(PDFDOCFILES): pdfroff groff troff gropdf $(PDFDOCFILES): $(dist_devpsfont_DATA) $(nodist_devpsfont_DATA) gnu.eps =20 pdfroff: contrib/pdfmark/pdfroff.sh $(SH_DEPS_SED_SCRIPT) - sed -f $(SH_DEPS_SED_SCRIPT) \ + $(AM_V_GEN)sed -f $(SH_DEPS_SED_SCRIPT) \ -e "s|[@]VERSION[@]|$(VERSION)|" \ -e "s|[@]GROFF_AWK_INTERPRETERS[@]|$(ALT_AWK_PROGS)|" \ -e "s|[@]GROFF_GHOSTSCRIPT_INTERPRETERS[@]|$(ALT_GHOSTSCRIPT_PROGS)= |" \ - -e "s|[@]GROFF_BIN_DIR[@]|$(bindir)|" $(pdfmark_srcdir)/pdfroff.sh = >$@ - chmod +x $@ + -e "s|[@]GROFF_BIN_DIR[@]|$(bindir)|" $(pdfmark_srcdir)/pdfroff.sh = \ + >$@ \ + && chmod +x $@ =20 mostlyclean-local: mostlyclean_pdfmark mostlyclean_pdfmark: diff --git a/contrib/pic2graph/pic2graph.am b/contrib/pic2graph/pic2graph= .am index 6a4c1a7..32fd63f 100644 --- a/contrib/pic2graph/pic2graph.am +++ b/contrib/pic2graph/pic2graph.am @@ -26,11 +26,13 @@ bin_SCRIPTS +=3D pic2graph EXTRA_DIST +=3D \ contrib/pic2graph/pic2graph.sh \ contrib/pic2graph/pic2graph.1.man + pic2graph: $(pic2graph_srcdir)/pic2graph.sh - sed -e "s|[@]g[@]|$(g)|g" \ + $(AM_V_GEN)sed -e "s|[@]g[@]|$(g)|g" \ -e "s|[@]VERSION[@]|$(VERSION)|" \ - -e $(SH_SCRIPT_SED_CMD) $(pic2graph_srcdir)/pic2graph.sh >$@ - chmod +x $@ + -e $(SH_SCRIPT_SED_CMD) $(pic2graph_srcdir)/pic2graph.sh \ + >$@ \ + && chmod +x $@ =20 =20 ######################################################################## diff --git a/font/devascii/devascii.am b/font/devascii/devascii.am index 17dc63f..90294be 100644 --- a/font/devascii/devascii.am +++ b/font/devascii/devascii.am @@ -34,18 +34,16 @@ EXTRA_DIST +=3D \ font/devascii/DESC.proto =20 $(DEVASCIIFONTSFILES): $(devascii_srcdir)/R.proto - @echo Making $@ - $(MKDIR_P) `dirname $@` - $(RM) $@ - $(SHELL) $(GENFONTSSH) $(devascii_srcdir)/R.proto \ - $(DEVASCIIRES) $(DEVASCIICPI) `basename $@` > $@ + $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ + && $(RM) $@ \ + && $(SHELL) $(GENFONTSSH) $(devascii_srcdir)/R.proto \ + $(DEVASCIIRES) $(DEVASCIICPI) `basename $@` > $@ =20 font/devascii/DESC: $(devascii_srcdir)/DESC.proto - @echo Making $@ - $(MKDIR_P) `dirname $@` - $(SHELL) $(GENDESCSH) $(devascii_srcdir)/DESC.proto \ - $(DEVASCIIRES) $(DEVASCIICPI) $(DEVASCIILPI) \ - $(DEVASCIIFONTS) > $@ + $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ + && $(SHELL) $(GENDESCSH) $(devascii_srcdir)/DESC.proto \ + $(DEVASCIIRES) $(DEVASCIICPI) $(DEVASCIILPI) \ + $(DEVASCIIFONTS) > $@ =20 =20 ######################################################################## diff --git a/font/devcp1047/devcp1047.am b/font/devcp1047/devcp1047.am index ec2234b..89a699b 100644 --- a/font/devcp1047/devcp1047.am +++ b/font/devcp1047/devcp1047.am @@ -32,18 +32,16 @@ MOSTLYCLEANFILES +=3D $(DEVCP1047FONTSFILES) font/dev= cp1047/DESC EXTRA_DIST +=3D font/devcp1047/R.proto font/devcp1047/DESC.proto =20 $(DEVCP1047FONTSFILES): $(devcp1047_srcdir)/R.proto - @echo Making $@ - @$(MKDIR_P) `dirname $@` - @$(RM) $@ - @$(SHELL) $(GENFONTSSH) $(devcp1047_srcdir)/R.proto \ - $(DEVCP1047RES) $(DEVCP1047CPI) `basename $@` > $@ + $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ + && $(RM) $@ \ + && $(SHELL) $(GENFONTSSH) $(devcp1047_srcdir)/R.proto \ + $(DEVCP1047RES) $(DEVCP1047CPI) `basename $@` > $@ =20 font/devcp1047/DESC: $(devcp1047_srcdir)/DESC.proto - @echo Making $@ - @$(MKDIR_P) `dirname $@` - @$(SHELL) $(GENDESCSH) $(devcp1047_srcdir)/DESC.proto \ - $(DEVCP1047RES) $(DEVCP1047CPI) $(DEVCP1047LPI) \ - $(DEVCP1047FONTS) > $@ + $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ + && $(SHELL) $(GENDESCSH) $(devcp1047_srcdir)/DESC.proto \ + $(DEVCP1047RES) $(DEVCP1047CPI) $(DEVCP1047LPI) \ + $(DEVCP1047FONTS) > $@ =20 =20 ######################################################################## diff --git a/font/devdvi/devdvi.am b/font/devdvi/devdvi.am index 07b9781..8a3ce4a 100644 --- a/font/devdvi/devdvi.am +++ b/font/devdvi/devdvi.am @@ -80,15 +80,15 @@ EXTRA_DIST +=3D $(DEVDVIFONTFILES) $(DEVDVIGENFILES) = font/devdvi/DESC.in MOSTLYCLEANFILES +=3D font/devdvi/DESC =20 font/devdvi/DESC: $(devdvi_srcdir)/DESC.in - @echo Making $@ - @$(MKDIR_P) `dirname $@` - @cat $(devdvi_srcdir)/DESC.in >$@ - @if test "$(PAGE)" =3D A4; then \ - echo "papersize a4" >>$@; \ - else \ - echo "papersize letter" >>$@; \ - fi - @test -z '$(DVIPRINT)' || echo print '$(DVIPRINT)' >>$@ + $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ + && cat $(devdvi_srcdir)/DESC.in >$@ \ + && if test "$(PAGE)" =3D A4; then \ + echo "papersize a4" >>$@; \ + else \ + echo "papersize letter" >>$@; \ + fi \ + && (test -z '$(DVIPRINT)' \ + || echo print '$(DVIPRINT)' >>$@) =20 =20 ######################################################################## diff --git a/font/devhtml/devhtml.am b/font/devhtml/devhtml.am index f3a0aee..8ee2566 100644 --- a/font/devhtml/devhtml.am +++ b/font/devhtml/devhtml.am @@ -43,18 +43,16 @@ EXTRA_DIST +=3D \ font/devhtml/R.in =20 $(DEVHTMLFONTSFILES): $(devhtml_srcdir)/R.proto - @echo Making $@ - @$(MKDIR_P) `dirname $@` - @$(RM) $@ - @$(SHELL) $(GENFONTSSH) $(devhtml_srcdir)/R.proto \ - $(DEVHTMLRES) $(DEVHTMLCPI) `basename $@` > $@ + $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ + && $(RM) $@ \ + && $(SHELL) $(GENFONTSSH) $(devhtml_srcdir)/R.proto \ + $(DEVHTMLRES) $(DEVHTMLCPI) `basename $@` > $@ =20 font/devhtml/DESC: $(devhtml_srcdir)/DESC.proto - @echo Making $@ - @$(MKDIR_P) `dirname $@` - @$(SHELL) $(GENDESCSH) $(devhtml_srcdir)/DESC.proto \ - $(DEVHTMLRES) $(DEVHTMLCPI) $(DEVHTMLLPI) $(DEVHTMLFONTS) > $@ - @echo "image_generator $(GHOSTSCRIPT)" >> $@ + $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ + && $(SHELL) $(GENDESCSH) $(devhtml_srcdir)/DESC.proto \ + $(DEVHTMLRES) $(DEVHTMLCPI) $(DEVHTMLLPI) $(DEVHTMLFONTS) > $@ \ + && echo "image_generator $(GHOSTSCRIPT)" >> $@ =20 =20 ######################################################################## diff --git a/font/devlatin1/devlatin1.am b/font/devlatin1/devlatin1.am index 7dd211d..71779d0 100644 --- a/font/devlatin1/devlatin1.am +++ b/font/devlatin1/devlatin1.am @@ -32,18 +32,16 @@ MOSTLYCLEANFILES +=3D $(DEVLATIN1FONTSFILES) font/dev= latin1/DESC EXTRA_DIST +=3D font/devlatin1/R.proto font/devlatin1/DESC.proto =20 $(DEVLATIN1FONTSFILES): $(devlatin1_srcdir)/R.proto - @echo Making $@ - @$(MKDIR_P) `dirname $@` - @$(RM) $@ - @$(SHELL) $(GENFONTSSH) $(devlatin1_srcdir)/R.proto \ - $(DEVLATIN1RES) $(DEVLATIN1CPI) `basename $@` > $@ + $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ + && $(RM) $@ \ + && $(SHELL) $(GENFONTSSH) $(devlatin1_srcdir)/R.proto \ + $(DEVLATIN1RES) $(DEVLATIN1CPI) `basename $@` > $@ =20 font/devlatin1/DESC: $(devlatin1_srcdir)/DESC.proto - @echo Making $@ - @$(MKDIR_P) `dirname $@` - @$(SHELL) $(GENDESCSH) $(devlatin1_srcdir)/DESC.proto \ - $(DEVLATIN1RES) $(DEVLATIN1CPI) $(DEVLATIN1LPI) \ - $(DEVLATIN1FONTS) > $@ + $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ + && $(SHELL) $(GENDESCSH) $(devlatin1_srcdir)/DESC.proto \ + $(DEVLATIN1RES) $(DEVLATIN1CPI) $(DEVLATIN1LPI) \ + $(DEVLATIN1FONTS) > $@ =20 =20 ######################################################################## diff --git a/font/devlbp/devlbp.am b/font/devlbp/devlbp.am index affd641..97a1501 100644 --- a/font/devlbp/devlbp.am +++ b/font/devlbp/devlbp.am @@ -44,15 +44,15 @@ EXTRA_DIST +=3D $(DEVLBPFONTFILES) font/devlbp/DESC.i= n MOSTLYCLEANFILES +=3D font/devlbp/DESC =20 font/devlbp/DESC: $(devlbp_srcdir)/DESC.in - @echo Making $@ - @$(MKDIR_P) `dirname $@` - @cat $(devlbp_srcdir)/DESC.in >$@ - @if test "$(PAGE)" =3D A4; then \ - echo "papersize a4" >>$@; \ - else \ - echo "papersize letter" >>$@; \ - fi - @test -z '$(LBPPRINT)' || echo print '$(LBPPRINT)' >>$@ + $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ + && cat $(devlbp_srcdir)/DESC.in >$@ \ + && if test "$(PAGE)" =3D A4; then \ + echo "papersize a4" >>$@; \ + else \ + echo "papersize letter" >>$@; \ + fi \ + && (test -z '$(LBPPRINT)' \ + || echo print '$(LBPPRINT)' >>$@) =20 =20 ######################################################################## diff --git a/font/devlj4/devlj4.am b/font/devlj4/devlj4.am index 00c8a2f..39de875 100644 --- a/font/devlj4/devlj4.am +++ b/font/devlj4/devlj4.am @@ -87,17 +87,17 @@ EXTRA_DIST +=3D font/devlj4/DESC.in MOSTLYCLEANFILES +=3D font/devlj4/DESC =20 font/devlj4/DESC: $(devlj4_srcdir)/DESC.in - @echo Making $@ - @$(MKDIR_P) `dirname $@` - @echo "res $(LJ4RES)" >$@ - @echo "unitwidth `expr 7620000 / $(LJ4RES)`" >>$@ - @cat $(devlj4_srcdir)/DESC.in >>$@ - @if test "$(PAGE)" =3D A4; then \ - echo "papersize a4" >>$@; \ - else \ - echo "papersize letter" >>$@; \ - fi - @test -z '$(LJ4PRINT)' || echo print '$(LJ4PRINT)' >>$@ + $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ + && echo "res $(LJ4RES)" >$@ \ + && echo "unitwidth `expr 7620000 / $(LJ4RES)`" >>$@ \ + && cat $(devlj4_srcdir)/DESC.in >>$@ \ + && if test "$(PAGE)" =3D A4; then \ + echo "papersize a4" >>$@; \ + else \ + echo "papersize letter" >>$@; \ + fi \ + && (test -z '$(LJ4PRINT)' \ + || echo print '$(LJ4PRINT)' >>$@) =20 fonts: devlj4_fonts devlj4_fonts: hpftodit font/devlj4/DESC diff --git a/font/devps/devps.am b/font/devps/devps.am index 93cc969..364faeb 100644 --- a/font/devps/devps.am +++ b/font/devps/devps.am @@ -139,15 +139,16 @@ EXTRA_DIST +=3D \ font/devps/generate/zapfdr.sed =20 font/devps/DESC: $(devps_srcdir)/DESC.in - @$(MKDIR_P) font/devps - @cat $(devps_srcdir)/DESC.in >$@ - @echo broken $(BROKEN_SPOOLER_FLAGS) >>$@ - @if test "$(PAGE)" =3D A4; then \ - echo "papersize a4" >>$@; \ - else \ - echo "papersize letter" >>$@; \ - fi - @test -z '$(PSPRINT)' || echo print '$(PSPRINT)' >>$@ + $(AM_V_GEN)$(MKDIR_P) font/devps \ + && cat $(devps_srcdir)/DESC.in >$@ \ + && echo broken $(BROKEN_SPOOLER_FLAGS) >>$@ \ + && if test "$(PAGE)" =3D A4; then \ + echo "papersize a4" >>$@; \ + else \ + echo "papersize letter" >>$@; \ + fi \ + && (test -z '$(PSPRINT)' \ + || echo print '$(PSPRINT)' >>$@) =20 fonts: devps_fonts # We add top_builddir to the PATH in case the only afmtodit available is @@ -158,17 +159,17 @@ devps_fonts: afmtodit font/devps/DESC srcdir=3D$(devps_srcdir)/generate DESC=3D$(devps_srcdir)/DESC.in =20 font/devps/prologue: $(devps_srcdir)/prologue.ps - @$(MKDIR_P) font/devps - $(RM) $@ - sed -f $(devps_srcdir)/psstrip.sed $? >$@ + $(AM_V_GEN)$(MKDIR_P) font/devps \ + && $(RM) $@ \ + && sed -f $(devps_srcdir)/psstrip.sed $? >$@ font/devps/zapfdr.pfa: $(devps_srcdir)/zapfdr.ps - @$(MKDIR_P) font/devps - $(RM) $@ - sed -f $(devps_srcdir)/psstrip.sed $? >$@ + $(AM_V_GEN)$(MKDIR_P) font/devps \ + && $(RM) $@ \ + && sed -f $(devps_srcdir)/psstrip.sed $? >$@ font/devps/symbolsl.pfa: $(devps_srcdir)/symbolsl.ps - @$(MKDIR_P) font/devps - $(RM) $@ - sed -f $(devps_srcdir)/psstrip.sed $? >$@ + $(AM_V_GEN)$(MKDIR_P) font/devps \ + && $(RM) $@ \ + && sed -f $(devps_srcdir)/psstrip.sed $? >$@ =20 =20 ######################################################################## diff --git a/font/devutf8/devutf8.am b/font/devutf8/devutf8.am index 80bfb07..f2e9271 100644 --- a/font/devutf8/devutf8.am +++ b/font/devutf8/devutf8.am @@ -36,17 +36,15 @@ EXTRA_DIST +=3D \ font/devutf8/R.in =20 $(DEVUTF8FONTSFILES): $(devutf8_srcdir)/R.proto - @echo Making $@ - @$(MKDIR_P) `dirname $@` - @$(RM) $@ - @$(SHELL) $(GENFONTSSH) $(devutf8_srcdir)/R.proto \ - $(DEVUTF8RES) $(DEVUTF8CPI) `basename $@` > $@ + $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ + && $(RM) $@ \ + && $(SHELL) $(GENFONTSSH) $(devutf8_srcdir)/R.proto \ + $(DEVUTF8RES) $(DEVUTF8CPI) `basename $@` > $@ =20 font/devutf8/DESC: $(devutf8_srcdir)/DESC.proto - @echo Making $@ - @$(MKDIR_P) `dirname $@` - @$(SHELL) $(GENDESCSH) $(devutf8_srcdir)/DESC.proto \ - $(DEVUTF8RES) $(DEVUTF8CPI) $(DEVUTF8LPI) $(DEVUTF8FONTS) > $@ + $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ + && $(SHELL) $(GENDESCSH) $(devutf8_srcdir)/DESC.proto \ + $(DEVUTF8RES) $(DEVUTF8CPI) $(DEVUTF8LPI) $(DEVUTF8FONTS) > $@ =20 =20 ######################################################################## diff --git a/src/devices/gropdf/gropdf.am b/src/devices/gropdf/gropdf.am index 6e49545..904b98e 100644 --- a/src/devices/gropdf/gropdf.am +++ b/src/devices/gropdf/gropdf.am @@ -35,21 +35,23 @@ man1_MANS +=3D \ src/devices/gropdf/pdfmom.1 =20 gropdf: $(gropdf_dir)/gropdf.pl $(SH_DEPS_SED_SCRIPT) - $(RM) $@ - sed -f $(SH_DEPS_SED_SCRIPT) \ - -e "s|[@]VERSION[@]|$(VERSION)|" \ - -e "s|[@]PERL[@]|$(PERL)|" \ - -e "s|[@]GROFF_FONT_DIR[@]|$(fontpath)|" \ - -e "s|[@]RT_SEP[@]|$(RT_SEP)|" $(gropdf_dir)/gropdf.pl >$@ - chmod +x $@ + $(AM_V_GEN)$(RM) $@ \ + && sed -f $(SH_DEPS_SED_SCRIPT) \ + -e "s|[@]VERSION[@]|$(VERSION)|" \ + -e "s|[@]PERL[@]|$(PERL)|" \ + -e "s|[@]GROFF_FONT_DIR[@]|$(fontpath)|" \ + -e "s|[@]RT_SEP[@]|$(RT_SEP)|" $(gropdf_dir)/gropdf.pl \ + >$@ \ + && chmod +x $@ =20 pdfmom: $(gropdf_dir)/pdfmom.pl $(SH_DEPS_SED_SCRIPT) - $(RM) $@ - sed -f $(SH_DEPS_SED_SCRIPT) \ - -e "s|[@]VERSION[@]|$(VERSION)|" \ - -e "s|[@]RT_SEP[@]|$(RT_SEP)|" \ - -e "s|[@]PERL[@]|$(PERL)|" $(gropdf_dir)/pdfmom.pl >$@ - chmod +x $@ + $(AM_V_GEN)$(RM) $@ \ + && sed -f $(SH_DEPS_SED_SCRIPT) \ + -e "s|[@]VERSION[@]|$(VERSION)|" \ + -e "s|[@]RT_SEP[@]|$(RT_SEP)|" \ + -e "s|[@]PERL[@]|$(PERL)|" $(gropdf_dir)/pdfmom.pl \ + >$@ \ + && chmod +x $@ =20 =20 ######################################################################## diff --git a/src/preproc/eqn/eqn.am b/src/preproc/eqn/eqn.am index 8d2f581..ac6b60a 100644 --- a/src/preproc/eqn/eqn.am +++ b/src/preproc/eqn/eqn.am @@ -59,11 +59,13 @@ CLEANFILES +=3D \ src/preproc/eqn/eqn.output =20 neqn: $(top_srcdir)/src/preproc/eqn/neqn.sh $(SH_DEPS_SED_SCRIPT) - $(RM) $@ - sed -e 's/[@]g[@]/$(g)/g' \ - -f $(SH_DEPS_SED_SCRIPT) \ - -e $(SH_SCRIPT_SED_CMD) $(top_srcdir)/src/preproc/eqn/neqn.sh >$@ - chmod +x $@ + $(AM_V_GEN)$(RM) $@ \ + && sed -e 's/[@]g[@]/$(g)/g' \ + -f $(SH_DEPS_SED_SCRIPT) \ + -e $(SH_SCRIPT_SED_CMD) \ + $(top_srcdir)/src/preproc/eqn/neqn.sh \ + >$@ \ + && chmod +x $@ =20 =20 ######################################################################## diff --git a/src/roff/grog/grog.am b/src/roff/grog/grog.am index 9ac1b85..bc506c7 100644 --- a/src/roff/grog/grog.am +++ b/src/roff/grog/grog.am @@ -37,18 +37,19 @@ EXTRA_DIST +=3D \ # Perl version works for all parts of 'groff'. =20 grog: $(grog_srcdir)/grog.pl $(GROG) $(SH_DEPS_SED_SCRIPT) - $(RM) $@ - sed -f "$(SH_DEPS_SED_SCRIPT)" \ - -e "1s|^\(#! \).*perl|\\1$(PERL)|" \ - -e "s|[@]g[@]|$(g)|g" \ - -e "s|[@]BINDIR[@]|$(DESTDIR)$(bindir)|g" \ - -e "s|[@]libdir[@]|$(DESTDIR)$(libdir)|g" \ - -e "s|[@]EGREP[@]|$(EGREP)|g" \ - -e "s|[@]VERSION[@]|$(VERSION)|" \ - -e "s|[@]grog_dir[@]|$(grog_dir)|" \ - -e "$(SH_SCRIPT_SED_CMD)" \ - $(grog_srcdir)/grog.pl >$@ - chmod +x $@ + $(AM_V_GEN)$(RM) $@ \ + && sed -f "$(SH_DEPS_SED_SCRIPT)" \ + -e "1s|^\(#! \).*perl|\\1$(PERL)|" \ + -e "s|[@]g[@]|$(g)|g" \ + -e "s|[@]BINDIR[@]|$(DESTDIR)$(bindir)|g" \ + -e "s|[@]libdir[@]|$(DESTDIR)$(libdir)|g" \ + -e "s|[@]EGREP[@]|$(EGREP)|g" \ + -e "s|[@]VERSION[@]|$(VERSION)|" \ + -e "s|[@]grog_dir[@]|$(grog_dir)|" \ + -e "$(SH_SCRIPT_SED_CMD)" \ + $(grog_srcdir)/grog.pl \ + >$@ \ + && chmod +x $@ =20 =20 ######################################################################## diff --git a/src/roff/nroff/nroff.am b/src/roff/nroff/nroff.am index 8ff8d35..e9b8c62 100644 --- a/src/roff/nroff/nroff.am +++ b/src/roff/nroff/nroff.am @@ -26,11 +26,13 @@ EXTRA_DIST +=3D \ src/roff/nroff/nroff.sh =20 nroff: $(nroff_srcdir)/nroff.sh $(SH_DEPS_SED_SCRIPT) - rm -f $@ - sed -f $(SH_DEPS_SED_SCRIPT) \ - -e $(SH_SCRIPT_SED_CMD) \ - -e "s|[@]VERSION[@]|$(VERSION)|" $(nroff_srcdir)/nroff.sh >$@ - chmod +x $@ + $(AM_V_GEN)rm -f $@ \ + && sed -f $(SH_DEPS_SED_SCRIPT) \ + -e $(SH_SCRIPT_SED_CMD) \ + -e "s|[@]VERSION[@]|$(VERSION)|" \ + $(nroff_srcdir)/nroff.sh \ + >$@ \ + && chmod +x $@ =20 =20 ######################################################################## diff --git a/src/utils/afmtodit/afmtodit.am b/src/utils/afmtodit/afmtodit= .am index 6b4fb95..f56aa90 100644 --- a/src/utils/afmtodit/afmtodit.am +++ b/src/utils/afmtodit/afmtodit.am @@ -34,21 +34,23 @@ EXTRA_DIST +=3D \ src/utils/afmtodit/make-afmtodit-tables =20 afmtodit: $(afmtodit_srcdir)/afmtodit.pl $(afmtodit_srcdir)/afmtodit.tab= les - if test -n "$(PERL)"; then \ + $(AM_V_GEN)if test -n "$(PERL)"; then \ sed -e "s|/usr/bin/perl|$(PERL)|" \ -e "s|[@]VERSION[@]|$(VERSION)|" \ -e "s|[@]FONTDIR[@]|$(fontdir)|" \ -e "/[@]afmtodit.tables[@]/ r $(afmtodit_srcdir)/afmtodit.tables"= \ -e "/[@]afmtodit.tables[@]/ d" \ - $(afmtodit_srcdir)/afmtodit.pl >afmtodit; \ + $(afmtodit_srcdir)/afmtodit.pl \ + >afmtodit; \ else \ sed -e "s|[@]VERSION[@]|$(VERSION)|" \ -e "s|[@]FONTDIR[@]|$(fontdir)|" \ -e "/[@]afmtodit.tables[@]/ r $(afmtodit_srcdir)/afmtodit.tables"= \ -e "/[@]afmtodit.tables[@]/ d" \ - $(afmtodit_srcdir)/afmtodit.pl >afmtodit; \ - fi - chmod +x afmtodit + $(afmtodit_srcdir)/afmtodit.pl \ + >afmtodit; \ + fi \ + && chmod +x afmtodit =20 =20 ########################################################################