From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Neil Jerram Newsgroups: gmane.lisp.guile.devel Subject: [PATCH 4/5] Inline the effect of am/pre-inst-guile Date: Mon, 21 Mar 2011 22:19:20 +0000 Message-ID: <1300745961-4287-5-git-send-email-neil@ossau.uklinux.net> References: <1300745961-4287-1-git-send-email-neil@ossau.uklinux.net> NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1300747561 5239 80.91.229.12 (21 Mar 2011 22:46:01 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 21 Mar 2011 22:46:01 +0000 (UTC) Cc: Neil Jerram To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Mon Mar 21 23:45:57 2011 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Q1nr3-0002kw-BX for guile-devel@m.gmane.org; Mon, 21 Mar 2011 23:45:54 +0100 Original-Received: from localhost ([127.0.0.1]:38096 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q1ne8-0000OQ-Hb for guile-devel@m.gmane.org; Mon, 21 Mar 2011 18:32:20 -0400 Original-Received: from [140.186.70.92] (port=40218 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q1nSS-0002em-8Y for guile-devel@gnu.org; Mon, 21 Mar 2011 18:20:47 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q1nSM-0002ZU-Tc for guile-devel@gnu.org; Mon, 21 Mar 2011 18:20:15 -0400 Original-Received: from mail3.uklinux.net ([80.84.72.33]:41573) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q1nSM-0002ZN-KX for guile-devel@gnu.org; Mon, 21 Mar 2011 18:20:10 -0400 Original-Received: from arudy (unknown [78.149.125.161]) by mail3.uklinux.net (Postfix) with ESMTP id BB75A1F665A for ; Mon, 21 Mar 2011 22:19:59 +0000 (GMT) Original-Received: from neil-laptop.520b.com (unknown [192.168.11.4]) by arudy (Postfix) with ESMTP id 9EF1D3803B; Mon, 21 Mar 2011 22:19:53 +0000 (GMT) X-Mailer: git-send-email 1.7.1 In-Reply-To: <1300745961-4287-1-git-send-email-neil@ossau.uklinux.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 80.84.72.33 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:11949 Archived-At: It's just one variable definition, and in my opinion it confuses, rather than helps, the overall build picture to have two names (preinstguile and meta/guile) for the same thing. * am/Makefile.am (am_frags): Remove pre-inst-guile. * am/pre-inst-guile: Deleted. * doc/ref/Makefile.am: Don't include am/pre-inst-guile. ($(snarf_doc).am, $(snarf_doc).texi): Expand $(preinstguile). * module/Makefile.am (ice-9/psyntax-pp.scm.gen): Don't include am/pre-inst-guile. (ice-9/psyntax-pp.scm.gen): Expand $(preinstguile). --- am/Makefile.am | 2 +- am/pre-inst-guile | 33 --------------------------------- doc/ref/Makefile.am | 7 +++---- module/Makefile.am | 3 +-- 4 files changed, 5 insertions(+), 40 deletions(-) delete mode 100644 am/pre-inst-guile diff --git a/am/Makefile.am b/am/Makefile.am index d1b7ecc..e2044d6 100644 --- a/am/Makefile.am +++ b/am/Makefile.am @@ -21,7 +21,7 @@ AUTOMAKE_OPTIONS = gnu -am_frags = pre-inst-guile maintainer-dirs guilec +am_frags = maintainer-dirs guilec EXTRA_DIST = $(am_frags) ChangeLog-2008 diff --git a/am/pre-inst-guile b/am/pre-inst-guile deleted file mode 100644 index b7b0d34..0000000 --- a/am/pre-inst-guile +++ /dev/null @@ -1,33 +0,0 @@ -## am/pre-inst-guile --- define preinstguile - -## Copyright (C) 2002, 2006, 2011 Free Software Foundation -## -## This file is part of GUILE. -## -## GUILE is free software; you can redistribute it and/or modify -## it under the terms of the GNU Lesser General Public License as -## published by the Free Software Foundation; either version 3, or -## (at your option) any later version. -## -## GUILE 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 Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with GUILE; see the file COPYING.LESSER. If not, write -## to the Free Software Foundation, Inc., 51 Franklin Street, Fifth -## Floor, Boston, MA 02110-1301 USA - -## Commentary: - -## This fragment defines the preinstguile variable -## It can be included in any Makefile.am by adding the line: -## include $(top_srcdir)/am/pre-inst-guile -## See devel/build/pre-inst-guile.text (CVS only) for more info. - -## Code: - -preinstguile = $(top_builddir_absolute)/meta/guile - -## am/pre-inst-guile ends here diff --git a/doc/ref/Makefile.am b/doc/ref/Makefile.am index c154f42..0359380 100644 --- a/doc/ref/Makefile.am +++ b/doc/ref/Makefile.am @@ -111,8 +111,6 @@ noinst_DATA = $(PICTURES) EXTRA_DIST = ChangeLog-2008 $(PICTURES) -include $(top_srcdir)/am/pre-inst-guile - # Automated snarfing autoconf.texi: autoconf-macros.texi @@ -129,7 +127,8 @@ snarf_doc = standard-library $(snarf_doc).am: $(snarf_doc).scm GUILE_AUTO_COMPILE=0 ; \ variable="`echo $(snarf_doc) | tr - _`_scm_files" ; \ - "$(preinstguile)" -l "$(srcdir)/$(snarf_doc).scm" -c " \ + "$(top_builddir_absolute)/meta/guile" -l "$(srcdir)/$(snarf_doc).scm" \ + -c " \ (format #t \"# Automatically generated, do not edit.~%\") \ (format #t \"$$variable = \") \ (for-each (lambda (m) \ @@ -143,7 +142,7 @@ include standard-library.am $(snarf_doc).texi: $(standard_library_scm_files) GUILE_AUTO_COMPILE=0 \ - "$(preinstguile)" "$(srcdir)/make-texinfo.scm" \ + "$(top_builddir_absolute)/meta/guile" "$(srcdir)/make-texinfo.scm" \ "$(abs_srcdir)/$(snarf_doc).scm" > "$@.tmp" mv "$@.tmp" "$@" diff --git a/module/Makefile.am b/module/Makefile.am index 9940900..754bebf 100644 --- a/module/Makefile.am +++ b/module/Makefile.am @@ -73,9 +73,8 @@ ETAGS_ARGS += \ ice-9/compile-psyntax.scm \ ice-9/ChangeLog-2008 -include $(top_srcdir)/am/pre-inst-guile ice-9/psyntax-pp.scm.gen: - $(preinstguile) --no-auto-compile -s $(srcdir)/ice-9/compile-psyntax.scm \ + $(top_builddir_absolute)/meta/guile --no-auto-compile -s $(srcdir)/ice-9/compile-psyntax.scm \ $(srcdir)/ice-9/psyntax.scm $(srcdir)/ice-9/psyntax-pp.scm .PHONY: ice-9/psyntax-pp.scm.gen -- 1.7.1