From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Pirotte Newsgroups: gmane.lisp.guile.devel Subject: guile-lib - devel branch - patch 10 of 11 Date: Fri, 15 Jul 2016 22:51:12 -0300 Message-ID: <20160715225112.7a3996e4@capac> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/1nawsGbcp5ERNsiS/_l/2JB"; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1468633927 9101 80.91.229.3 (16 Jul 2016 01:52:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jul 2016 01:52:07 +0000 (UTC) To: guile-devel Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Sat Jul 16 03:51:56 2016 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1bOElc-0006xT-AD for guile-devel@m.gmane.org; Sat, 16 Jul 2016 03:51:44 +0200 Original-Received: from localhost ([::1]:35611 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bOElb-0008EE-M6 for guile-devel@m.gmane.org; Fri, 15 Jul 2016 21:51:43 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bOElM-0008E8-Bu for guile-devel@gnu.org; Fri, 15 Jul 2016 21:51:29 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bOElI-0003ze-6b for guile-devel@gnu.org; Fri, 15 Jul 2016 21:51:27 -0400 Original-Received: from maximusconfessor.all2all.org ([79.99.200.102]:34303) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bOElH-0003za-TG for guile-devel@gnu.org; Fri, 15 Jul 2016 21:51:24 -0400 Original-Received: from localhost (unknown [192.168.0.2]) by maximusconfessor.all2all.org (Postfix) with ESMTP id 6FD30A04C144 for ; Sat, 16 Jul 2016 03:51:23 +0200 (CEST) Original-Received: from maximusconfessor.all2all.org ([192.168.0.1]) by localhost (maximusconfessor.all2all.org [192.168.0.2]) (amavisd-new, port 10024) with ESMTP id W7mRjmfr8+Tv for ; Sat, 16 Jul 2016 03:51:18 +0200 (CEST) Original-Received: from capac (unknown [177.17.12.124]) by maximusconfessor.all2all.org (Postfix) with ESMTPSA id BB1DAA04C141 for ; Sat, 16 Jul 2016 03:51:16 +0200 (CEST) X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 79.99.200.102 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Original-Sender: "guile-devel" Xref: news.gmane.org gmane.lisp.guile.devel:18519 Archived-At: --Sig_/1nawsGbcp5ERNsiS/_l/2JB Content-Type: multipart/mixed; boundary="MP_/r.b96mtGwG79CyHFVdRFZc/" --MP_/r.b96mtGwG79CyHFVdRFZc/ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline guile-lib - devel branch - patch 10 of 11 --MP_/r.b96mtGwG79CyHFVdRFZc/ Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0010-Fixing-make-distcheck.patch =46rom 28fb77f545e5ed1c905002562285eb645e8e8ef4 Mon Sep 17 00:00:00 2001 From: David Pirotte Date: Thu, 14 Jul 2016 23:42:02 -0300 Subject: [PATCH 10/11] Fixing make distcheck * doc/docs.mk: (a) adding a license header; (b) removing a double entry in clean-docs target; (c) adding DISTCLEANFILES; (d) removing $(doc)scmfiles (it was not actually used anywhere); (e) removing $(doc)depfiles target, instead declare 'depfiles' as a toplevel variable. Notes: (1) wrt to (e), it was the only (unportable) way I found to have 'make ditcheck' work. The problem of having $(depfiles) as the result of a target is, because the documentation is generated (there is no guile-library.texi files in the distribution), and due to both (a) the way automake determines which files must be generated (timestamp), IIUC, and (b) the fact that file generation occurs in $(builddir), all this, unconditionally leaded to a texinfo [and dvi, pdf, ...) error, since in the $(buiddir), none of the guile-library.texi dependency files (fdl and NamesConventions) exist. Leaving things as they were ans using TEXINFO :=3D $(TEXINFO) -I ../../../doc would not work either, because that triggers an attempt to write in $(scrdir), which is prohibited; (2) this solution is unportable (it depends on GNU Make), but this is not the first, guile-lib already used $(addprefix), so I guess with this respect my patch is ok. Of course if someone else has/knows a better solution, I'm all hears, ping me! (3) A special thank here to Colomban Wendling, aka b4n, who spent a couple of hours with me on irc, #autotool, to track this issue down, to finally conclude that, in his opinion and within the scope of his knowledge, there would be no way to solve this using targets. --- doc/docs.mk | 55 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/doc/docs.mk b/doc/docs.mk index 8095b4e..4676b7f 100644 --- a/doc/docs.mk +++ b/doc/docs.mk @@ -1,29 +1,58 @@ + +#### +#### Copyright (C) 2016 David Pirotte +#### David Pirotte + +#### This file is part of Guile-Lib. + +#### Guile-Lib is free software: you can redistribute it, as a whole, +#### and/or modify it under the terms of the GNU General Public +#### License as published by the Free Software Foundation, either +#### version 3 of the License, or (at your option) any later version. + +#### Each Guile-Lib module contained in Guile-Lib has its own copying +#### conditions, specified in the comments at the beginning of the +#### module's source file. + +#### Guile-Lib is distributed in the hope that it will be useful, but +#### WITHOUT ANY WARRANTY; without even the implied warranty of +#### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +#### General Public License for more details. + +#### You should have received a copy of the GNU General Public License +#### along with Guile-Lib. If not, see +#### . +#### + + clean-docs: rm -f $(doc).texi rm -f $(doc).info - rm -f $(doc)scmfiles rm -f html-stamp rm -rf html - rm -f $(addprefix $(doc).,aux cp cps fn fns ky log pdf pg pg toc tp tps v= r vrs) + rm -f $(addprefix $(doc).,aux cp cps fn fns ky log pdf pg toc tp tps vr v= rs) rm -rf $(doc).html =20 -EXTRA_DIST=3D$(doc).scm make-texinfo.scm make-html.scm docs.mk -DISTCLEANFILES=3D$(doc).texi $(doc)scmfiles +EXTRA_DIST =3D \ + $(doc).scm \ + make-texinfo.scm \ + make-html.scm \ + docs.mk + +DISTCLEANFILES =3D \ + Makefile.in =20 -$(doc)scmfiles: - GUILE_AUTO_COMPILE=3D0 \ - $(GUILE) --debug --use-srfi=3D13 -l $(srcdir)/$(doc).scm \ - -c '(for-each (lambda (m) (format #t "~a.scm\n" (string-join (map symbol= ->string m) "/"))) (map car *modules*))' \ - > $@ -depfiles=3D$(addprefix $(top_srcdir)/src/,$(shell test ! -f $(doc)scmfiles= || cat $(doc)scmfiles)) +depfiles =3D $(shell $(GUILE) --no-auto-compile --debug --use-srfi=3D13 -l= $(srcdir)/$(doc).scm -c '(for-each (lambda (m) (format \#t "$(top_srcdir)/= src/~a.scm " (string-join (map symbol->string m) "/"))) (map car *modules*)= )') =20 -$(doc).texi: $(srcdir)/$(doc).scm $(doc)scmfiles $(depfiles) +dummy: + printf '$(depfiles)' + +$(doc).texi: $(srcdir)/$(doc).scm $(depfiles) GUILE_AUTO_COMPILE=3D0 \ $(top_builddir)/dev-environ $(srcdir)/make-texinfo.scm $(srcdir)/$(doc).s= cm >$@ =20 html-local: html-stamp $(srcdir)/$(doc).scm $(depfiles) -html-stamp: $(scm-module-files) +html-stamp: GUILE_AUTO_COMPILE=3D0 \ $(top_builddir)/dev-environ $(srcdir)/make-html.scm $(srcdir)/$(doc).scm touch $@ - --=20 2.8.1 --MP_/r.b96mtGwG79CyHFVdRFZc/-- --Sig_/1nawsGbcp5ERNsiS/_l/2JB Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJXiZMQAAoJEPN0/ZOjBXrXWgEH/2KnJXcvmdEr+sKuBY41i3Qk CbDebaBY1fq8f3ZYGQ8rPhIOgoK3jkTaUKLbyo+gddlkzyDmtyAgL7XgM4Ez2n4q 673SIM8NMN6S4wUvnswQEK74tHN/3KJVC/jR08SWlFikn0w1VlMG2F1UJdxQuwkR wSnFRC5CtvUYvy3JxeAgf+2gfcaB+tKKInGWzExmOgGytmt5ODA+s5Nwfop4RYn6 KOEo1pOG/QBvMV8rF9ty2c1ROFgvKz8MfUF/Ig2utpzGb9ZTwFR6zULn7ElPVscB vj3O4bXbcrZzTAZbr3yIysuwEmbOFww3mH0DQfIqGmBWcdOoqgfJfJZhMHjXM4c= =smpO -----END PGP SIGNATURE----- --Sig_/1nawsGbcp5ERNsiS/_l/2JB--