[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 21/437: clarify bundling documentation and improve autoc
From: |
Andy Wingo |
Subject: |
[Guile-commits] 21/437: clarify bundling documentation and improve autoconf macro |
Date: |
Mon, 2 Jul 2018 05:13:37 -0400 (EDT) |
wingo pushed a commit to branch lightning
in repository guile.
commit e193b0939adeac1640c43cccea7a70d9c599c968
Author: Paolo Bonzini <address@hidden>
Date: Mon Jul 10 09:43:04 2006 +0000
clarify bundling documentation and improve autoconf macro
2006-07-06 Paolo Bonzini <address@hidden>
Ludovic Courtes <address@hidden>
* doc/using.texi: Clarify "Using autoconf" section
and rename it to "Bundling lightning"
* lightning.m4: Work also if lightning is not bundled.
Patches applied:
* address@hidden/lightning--stable--1.2--patch-2
Fixed `LIGHTNING_CONFIGURE_IF_NOT_FOUND' in the case where `lightning.h'
is not found.
git-archimport-id: address@hidden/lightning--stable--1.2--patch-23
---
ChangeLog | 7 +++++++
Makefile.am | 2 +-
Makefile.in | 48 ++++++++++++++++++++++++++++++++++--------------
doc/toc.texi | 10 +++++-----
doc/using.texi | 21 ++++++++++++---------
lightning.m4 | 7 ++++---
6 files changed, 63 insertions(+), 32 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b12f03f..c0da586 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
2006-07-06 Paolo Bonzini <address@hidden>
Ludovic Courtes <address@hidden>
+ * doc/using.texi: Clarify "Using autoconf" section
+ and rename it to "Bundling lightning"
+ * lightning.m4: Work also if lightning is not bundled.
+
+2006-07-06 Paolo Bonzini <address@hidden>
+ Ludovic Courtes <address@hidden>
+
* lightning/ppc/core.h (_jit_mod): Replace with...
(_jit_mod_big, _jit_mod_small): ... these.
(jit_modi_i, jit_modi_ui): Rewrite.
diff --git a/Makefile.am b/Makefile.am
index def59bd..6e5faa6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.7 gnu
SUBDIRS = . doc lightning opcode tests
EXTRA_DIST = config/texi2dvi config/help2man
-noinst_HEADERS = lightning.h
+include_HEADERS = lightning.h
aclocaldir = $(datadir)/aclocal
dist_aclocal_DATA = lightning.m4
diff --git a/Makefile.in b/Makefile.in
index c190be2..88a0ec6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,7 +40,7 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
DIST_COMMON = README $(am__configure_deps) $(dist_aclocal_DATA) \
- $(noinst_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(srcdir)/lightningize.in \
$(top_srcdir)/configure AUTHORS COPYING COPYING.DOC \
COPYING.LESSER ChangeLog INSTALL NEWS THANKS \
@@ -57,7 +57,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache
config.log \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = lightningize
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(aclocaldir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(aclocaldir)" \
+ "$(DESTDIR)$(includedir)"
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS)
SOURCES =
@@ -76,7 +77,8 @@ am__vpath_adj = case $$p in \
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
dist_aclocalDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_aclocal_DATA)
-HEADERS = $(noinst_HEADERS)
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS)
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -190,7 +192,7 @@ target_vendor = @target_vendor@
AUTOMAKE_OPTIONS = 1.7 gnu
SUBDIRS = . doc lightning opcode tests
EXTRA_DIST = config/texi2dvi config/help2man
-noinst_HEADERS = lightning.h
+include_HEADERS = lightning.h
aclocaldir = $(datadir)/aclocal
dist_aclocal_DATA = lightning.m4
bin_SCRIPTS = lightningize
@@ -287,6 +289,23 @@ uninstall-dist_aclocalDATA:
echo " rm -f '$(DESTDIR)$(aclocaldir)/$$f'"; \
rm -f "$(DESTDIR)$(aclocaldir)/$$f"; \
done
+install-includeHEADERS: $(include_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p'
'$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+
+uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -567,7 +586,7 @@ check: check-recursive
all-am: Makefile $(SCRIPTS) $(DATA) $(HEADERS) config.h
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(aclocaldir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(aclocaldir)"
"$(DESTDIR)$(includedir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
@@ -613,7 +632,7 @@ info: info-recursive
info-am:
-install-data-am: install-dist_aclocalDATA
+install-data-am: install-dist_aclocalDATA install-includeHEADERS
install-exec-am: install-binSCRIPTS
@@ -642,7 +661,7 @@ ps: ps-recursive
ps-am:
uninstall-am: uninstall-binSCRIPTS uninstall-dist_aclocalDATA \
- uninstall-info-am
+ uninstall-includeHEADERS uninstall-info-am
uninstall-info: uninstall-info-recursive
@@ -654,13 +673,14 @@ uninstall-info: uninstall-info-recursive
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-binSCRIPTS \
install-data install-data-am install-dist_aclocalDATA \
- install-exec install-exec-am install-info install-info-am \
- install-man install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-binSCRIPTS uninstall-dist_aclocalDATA \
+ install-exec install-exec-am install-includeHEADERS \
+ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-binSCRIPTS \
+ uninstall-dist_aclocalDATA uninstall-includeHEADERS \
uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/doc/toc.texi b/doc/toc.texi
index 56b2e10..193d4f2 100644
--- a/doc/toc.texi
+++ b/doc/toc.texi
@@ -4,11 +4,11 @@
@macro usingmenu{}
@ifset USING
-* Installation:: Configuring and installing GNU lightning
-* The instruction set:: The RISC instruction set used i GNU lightning
-* GNU lightning macros:: GNU lightning's macros
-* Reentrancy:: Re-entrant usage of GNU lightning
-* Autoconf support:: Using @code{autoconf} with GNU lightning
+* Installation:: Configuring and installing GNU lightning
+* The instruction set:: The RISC instruction set used i GNU lightning
+* GNU lightning macros:: GNU lightning's macros
+* Reentrancy:: Re-entrant usage of GNU lightning
+* Bundling GNU lightning:: Using GNU lightning in your programs
@end ifset
@end macro
diff --git a/doc/using.texi b/doc/using.texi
index 9a0a7c0..fa6a0b4 100644
--- a/doc/using.texi
+++ b/doc/using.texi
@@ -1163,8 +1163,8 @@ constant. Of course, expressions like @code{JIT_R0} and
@code{JIT_R(0)} denote the same register, and likewise for
integer callee-saved, or floating-point, registers.
address@hidden Autoconf support
address@hidden Using @code{autoconf} with @lightning{}
address@hidden Bundling GNU lightning
address@hidden Using @lightning{} in your programs
It is very easy to include @lightning{}'s source code (without the
documentation and examples) into your program's distribution
@@ -1180,10 +1180,13 @@ distribution directory.
@end example
@noindent
-If you're using Automake, you might be pleased to know that
+This will copy the source code for the @lightning{} back ends
+into the @file{lightning} directory of your package.
+
address@hidden If you're using Automake, you might be pleased to know that
@file{Makefile.am} files will be already there.
address@hidden If you're not using Automake and @code{aclocal}, instead,
+If you're not using Automake and @code{aclocal}, instead,
you should delete the @file{Makefile.am} files (they are of no use
to you) and copy the contents of the @file{lightning.m4} file, found in
@command{aclocal}'s macro repository (usually @file{/usr/share/aclocal},
@@ -1195,12 +1198,12 @@ macro in your @file{configure.in} file.
@code{LIGHTNING_CONFIGURE_IF_NOT_FOUND} will first look for a
pre-installed copy of @lightning{} and, if it can be found, it will
-use it; otherwise, it will do exactly the same things that
address@hidden's own configure script does. If @lightning{} is
-already installed, or if the configuration process succeeds, it
-will define the @code{HAVE_LIGHTNING} symbol.
+use it; otherwise, it will test if there is a back-end for the host
+system. If @lightning{} is already installed, or if the system is
+supported by lightning, it will define the @code{HAVE_LIGHTNING}
+symbol.
-In addtion, an Automake conditional named @code{HAVE_INSTALLED_LIGHTNING}
+In addition, an Automake conditional named @code{HAVE_INSTALLED_LIGHTNING}
will be set if @lightning{} is already installed, which can be used to
set up include paths appropriately.
diff --git a/lightning.m4 b/lightning.m4
index 280a63e..1c9d01f 100644
--- a/lightning.m4
+++ b/lightning.m4
@@ -18,12 +18,13 @@ else
powerpc) cpu_subdir=ppc ;;
*) ;;
esac
- test -n "$cpu_subdir" && lightning=yes
+ test -n "$cpu_subdir" && test -d "$srcdir/lightning/$cpu_subdir" && \
+ lightning=yes
fi
ifdef([AC_HELP_STRING], [
dnl autoconf 2.50 style
- if test -n "$cpu_subdir"; then
+ if test -n "$cpu_subdir" && test -d "$srcdir/lightning/$cpu_subdir"; then
AC_CONFIG_LINKS(lightning/asm.h:lightning/$cpu_subdir/asm.h
lightning/core.h:lightning/$cpu_subdir/core.h
lightning/fp.h:lightning/$cpu_subdir/fp.h
@@ -34,7 +35,7 @@ ifdef([AC_HELP_STRING], [
], [
dnl autoconf 2.13 style
AC_OUTPUT_COMMANDS([
- if test -n "$cpu_subdir"; then
+ if test -n "$cpu_subdir" && test -d "$srcdir/lightning/$cpu_subdir"; then
for i in asm fp core funcs; do
echo linking $srcdir/lightning/$cpu_subdir/$i.h to lightning/$i.h
(cd lightning && $LN_S -f $srcdir/$cpu_subdir/$i.h $i.h)
- [Guile-commits] 19/437: fix mprotect for i386, (continued)
- [Guile-commits] 19/437: fix mprotect for i386, Andy Wingo, 2018/07/02
- [Guile-commits] 06/437: fix ppc tests, Andy Wingo, 2018/07/02
- [Guile-commits] 17/437: fix PPC jit_ldxi_* with big displacement, Andy Wingo, 2018/07/02
- [Guile-commits] 22/437: one more tweak to fix distribution, Andy Wingo, 2018/07/02
- [Guile-commits] 18/437: don't use __func__ nor __FUNCTION__ if not compiling with GNU C., Andy Wingo, 2018/07/02
- [Guile-commits] 26/437: fix i386 syntax error, Andy Wingo, 2018/07/02
- [Guile-commits] 08/437: fixes to sparc floating point, Andy Wingo, 2018/07/02
- [Guile-commits] 10/437: add more autotools-generated files, Andy Wingo, 2018/07/02
- [Guile-commits] 23/437: fix `make dist' bug and prepare for releasing 1.2a, Andy Wingo, 2018/07/02
- [Guile-commits] 27/437: Fix assertion failures in i386 movs and movz opcodes, Andy Wingo, 2018/07/02
- [Guile-commits] 21/437: clarify bundling documentation and improve autoconf macro,
Andy Wingo <=
- [Guile-commits] 32/437: fix powerpc jit_bms, Andy Wingo, 2018/07/02
- [Guile-commits] 24/437: bump version, add ldxi test case, Andy Wingo, 2018/07/02
- [Guile-commits] 30/437: added ret test and clarified JIT_RET documentation, Andy Wingo, 2018/07/02
- [Guile-commits] 20/437: fix PPC modi, Andy Wingo, 2018/07/02
- [Guile-commits] 35/437: remove pushr/popr from testsuite, Andy Wingo, 2018/07/02
- [Guile-commits] 31/437: prepare for automatic variables support, Andy Wingo, 2018/07/02
- [Guile-commits] 29/437: cherrypick from ludovic courtes, Andy Wingo, 2018/07/02
- [Guile-commits] 33/437: add jit_allocai for SPARC, Andy Wingo, 2018/07/02
- [Guile-commits] 16/437: Fix comments in config.h.in git-archimport-id: address@hidden/lightning--stable--1.2--patch-18, Andy Wingo, 2018/07/02
- [Guile-commits] 37/437: fix x86-64 builds, Andy Wingo, 2018/07/02