[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/5] Inline the effect of am/pre-inst-guile
From: |
Neil Jerram |
Subject: |
[PATCH 4/5] Inline the effect of am/pre-inst-guile |
Date: |
Mon, 21 Mar 2011 22:19:20 +0000 |
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" > "address@hidden"
mv "address@hidden" "$@"
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
- Some simple build simplification patches, Neil Jerram, 2011/03/21
- [PATCH 3/5] Make explicit that GUILE_FOR_BUILD is only used when cross-compiling, Neil Jerram, 2011/03/21
- [PATCH 2/5] GUILE_FOR_BUILD is only needed by meta/guile.in, not by Makefiles, Neil Jerram, 2011/03/21
- [PATCH 1/5] Remove unused definition of preinstguiletool, Neil Jerram, 2011/03/21
- [PATCH 4/5] Inline the effect of am/pre-inst-guile,
Neil Jerram <=
- [PATCH 5/5] Remove statements about scripts/* that are no longer true, Neil Jerram, 2011/03/21
- Re: Some simple build simplification patches, Andy Wingo, 2011/03/25