[Guile-commits] GNU Guile branch, master, updated. release_1-9-6-66-g208fae8

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=208fae8a0ebaa56b69105c89d69e337aef6a3e62

The branch, master has been updated
       via  208fae8a0ebaa56b69105c89d69e337aef6a3e62 (commit)
       via  2bc8d9eff694d2160a005edecc95cdc088d546f1 (commit)
       via  e3eefae0e596a587e91693ed37a61699ac66560a (commit)
      from  a5bbb22e83fc724650973dab5eb6f3eccbc1f65c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 208fae8a0ebaa56b69105c89d69e337aef6a3e62
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jan 3 19:15:42 2010 +0100

    Update `.gitignore'.

commit 2bc8d9eff694d2160a005edecc95cdc088d546f1
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jan 3 19:15:05 2010 +0100

    Add per-directory Emacs local variables.

commit e3eefae0e596a587e91693ed37a61699ac66560a
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jan 3 19:06:52 2010 +0100

    Remove dependency on GNU Make and reliance on /usr/bin/env.
    
    Both were introduced in commit c55cb58a ("integrate guile-lib docs").
    
    * doc/ref/Makefile.am ($(snarf_doc)scmfiles): Rename target to...
      ($(snarf_doc)-scmfiles): ... this.  Change to generate a makefile
      snippet containing a variable definition.  Automake-include the
      generated snippet, `standard-library.am'.
      (EXTRA_DIST): Add `$(snarf_doc).am'.
      (CLEANFILES): Remove `$(snarf_doc)scmfiles'.
    
    * doc/ref/make-texinfo.scm: Remove executable bit and "#!/usr/bin/env".
    
    * doc/ref/standard-library.am: New file.

-----------------------------------------------------------------------

Summary of changes:
 .dir-locals.el              |    7 +++++++
 .gitignore                  |    2 ++
 doc/ref/Makefile.am         |   39 ++++++++++++++++++++++++++-------------
 doc/ref/make-texinfo.scm    |    3 ---
 doc/ref/standard-library.am |    2 ++
 5 files changed, 37 insertions(+), 16 deletions(-)
 create mode 100644 .dir-locals.el
 mode change 100755 => 100644 doc/ref/make-texinfo.scm
 create mode 100644 doc/ref/standard-library.am

diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 0000000..b17c79b
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,7 @@
+;; Per-directory local variables for GNU Emacs 23 and later.
+
+((nil             . ((fill-column . 80)
+                     (tab-width   .  8)))
+ (c-mode          . ((c-file-style . "gnu")))
+ (scheme-mode     . ((indent-tabs-mode . nil)))
+ (emacs-lisp-mode . ((indent-tabs-mode . nil))))
diff --git a/.gitignore b/.gitignore
index c09924b..e761f17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,6 +111,8 @@ INSTALL
 /lib/arpa/inet.h
 /lib/stdio.h
 /lib/sys/stat.h
+/lib/arg-nonnull.h
+/lib/link-warning.h
 /GPATH
 /GRTAGS
 /GSYMS
diff --git a/doc/ref/Makefile.am b/doc/ref/Makefile.am
index 904124f..a587343 100644
--- a/doc/ref/Makefile.am
+++ b/doc/ref/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with Automake to create Makefile.in
 ##
-##     Copyright (C) 1998, 2004, 2006, 2008, 2009 Free Software Foundation, 
Inc.
+##     Copyright (C) 1998, 2004, 2006, 2008, 2009, 2010 Free Software 
Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -130,15 +130,28 @@ EXTRA_DIST += lib-version.texi
 CLEANFILES = lib-version.texi
 
 # Support for snarfing docs out of Scheme modules.
-snarf_doc=standard-library
-$(snarf_doc)scmfiles:
-       $(preinstguile) -l $(srcdir)/$(snarf_doc).scm \
-        -c '(for-each (lambda (m) (format #t "~a.scm\n" (string-join (map 
symbol->string m) "/"))) (map car *modules*))' \
-        > $@
-depfiles=$(addprefix $(top_srcdir)/module/,$(shell test ! -f 
$(snarf_doc)scmfiles || cat $(snarf_doc)scmfiles))
-
-$(snarf_doc).texi: $(srcdir)/$(snarf_doc).scm $(snarf_doc)scmfiles $(depfiles)
-       $(top_builddir)/meta/uninstalled-env $(srcdir)/make-texinfo.scm 
$(srcdir)/$(snarf_doc).scm >$@
-
-CLEANFILES+=$(snarf_doc).texi $(snarf_doc)scmfiles
-EXTRA_DIST+=$(snarf_doc).scm make-texinfo.scm $(snarf_doc).texi 
$(snarf_doc)scmfiles
+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 "                  
\
+        (format #t \"# Automatically generated, do not edit.~%\")              
\
+        (format #t \"$$variable = \")                                          
\
+        (for-each (lambda (m)                                                  
\
+                    (format #t \"$$""(top_srcdir)/module/~a.scm \"             
\
+                            (string-join (map symbol->string m) \"/\")))       
\
+                  (map car *modules*))" > "address@hidden"
+       mv "address@hidden" "$@"
+
+# The following line leads to the definition of $(standard_library_scm_files).
+include standard-library.am
+
+$(snarf_doc).texi: $(standard_library_scm_files)
+       GUILE_AUTO_COMPILE=0                            \
+       "$(preinstguile)" "$(srcdir)/make-texinfo.scm"  \
+         "$(srcdir)/$(snarf_doc).scm" > "address@hidden"
+       mv "address@hidden" "$@"
+
+CLEANFILES += $(snarf_doc).texi
+EXTRA_DIST += $(snarf_doc).scm make-texinfo.scm $(snarf_doc).texi 
$(snarf_doc).am
diff --git a/doc/ref/make-texinfo.scm b/doc/ref/make-texinfo.scm
old mode 100755
new mode 100644
index ec59742..c967bc1
--- a/doc/ref/make-texinfo.scm
+++ b/doc/ref/make-texinfo.scm
@@ -1,6 +1,3 @@
-#!/usr/bin/env guile
-!#
-
 ;; make-texinfo.scm -- document a set of scheme modules as texinfo
 ;; Copyright (C) 2006,2007,2009  Andy Wingo <wingo at pobox dot com>
 
diff --git a/doc/ref/standard-library.am b/doc/ref/standard-library.am
new file mode 100644
index 0000000..27246f4
--- /dev/null
+++ b/doc/ref/standard-library.am
@@ -0,0 +1,2 @@
+# Automatically generated, do not edit.
+standard_library_scm_files = $(top_srcdir)/module/statprof.scm 
$(top_srcdir)/module/sxml/apply-templates.scm 
$(top_srcdir)/module/sxml/fold.scm $(top_srcdir)/module/sxml/simple.scm 
$(top_srcdir)/module/sxml/ssax.scm 
$(top_srcdir)/module/sxml/ssax/input-parse.scm 
$(top_srcdir)/module/sxml/transform.scm $(top_srcdir)/module/sxml/xpath.scm 
$(top_srcdir)/module/texinfo.scm $(top_srcdir)/module/texinfo/docbook.scm 
$(top_srcdir)/module/texinfo/html.scm $(top_srcdir)/module/texinfo/indexing.scm 
$(top_srcdir)/module/texinfo/string-utils.scm 
$(top_srcdir)/module/texinfo/plain-text.scm 
$(top_srcdir)/module/texinfo/serialize.scm 
$(top_srcdir)/module/texinfo/reflection.scm 
\ No newline at end of file


hooks/post-receive
-- 
GNU Guile