mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

Inline the effect of am/pre-inst-guile

Browse source 
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).
This commit is contained in:
Neil Jerram 2011-03-20 23:50:22 +00:00
parent aab99f7b8b
commit 6b8bc6f8b5
4 changed files with 5 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
am/Makefile.am
View file

@ -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

33
am/pre-inst-guile
View file

@ -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

7
doc/ref/Makefile.am
View file

@ -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" "$@"

3
module/Makefile.am
View file

@ -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