[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-539-g3374fa0

[Stefano Lattarini]

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 Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=3374fa0fcf0cce492762f5bd0d0392102ef36f21

The branch, master has been updated
       via  3374fa0fcf0cce492762f5bd0d0392102ef36f21 (commit)
       via  0addd6920277f4188380eced71a753c94ed84615 (commit)
       via  f6ab59edd56044980c06fb3c57a3c96dd4e6cfbb (commit)
       via  4b285ef86883d30d9fe74a2d33366ee2398bc86e (commit)
       via  633f37600999b5736443e6ad3d94edbd29e55184 (commit)
      from  a5fd43f68311ac7957f4da83987d245dcd735e26 (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 3374fa0fcf0cce492762f5bd0d0392102ef36f21
Merge: 0addd69 f6ab59e
Author: Stefano Lattarini <address@hidden>
Date:   Sat Dec 18 12:22:49 2010 +0100

    Merge branch 'maint'

commit 0addd6920277f4188380eced71a753c94ed84615
Merge: a5fd43f 633f376
Author: Stefano Lattarini <address@hidden>
Date:   Sat Dec 18 12:22:46 2010 +0100

    Merge branch 'tests-init'

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

Summary of changes:
 ChangeLog         |   20 ++++++++++++++++++++
 doc/automake.texi |    8 +++++---
 tests/defs        |    1 +
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e698ed3..13759a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2010-12-18  Stefano Lattarini  <address@hidden>
+
+       docs: fix blunder in example about python extension modules
+       * doc/automake.texi (Python): Use `quaternion_la_SOURCES',
+       not `quaternion_SOURCES', to declare the sources of python
+       extension module `quaternion.la'.
+
+2010-12-16  Stefano Lattarini  <address@hidden>
+
+       docs: list LTLIBRARIES among Automake primaries
+       * doc/automake.texi (Uniform): List `LTLIBRARIES' among
+       the Automake primaries.
+
+2010-12-13  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Tests defs: requirement 'xsi-shell' must be synced with libtool.
+       * tests/defs (xsi-shell): Add comment telling to keep the
+       XSI-conformance checks in sync with libtool.
+
 2010-12-13  Stefano Lattarini  <address@hidden>
 
        Extend, fix and improve tests on Lex and Yacc support.
diff --git a/doc/automake.texi b/doc/automake.texi
index c74dac7..38142ec 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -2024,10 +2024,12 @@ should not be built until the @samp{make check} command 
is run.  Those
 objects are not installed either.
 
 The current primary names are @samp{PROGRAMS}, @samp{LIBRARIES},
address@hidden, @samp{PYTHON}, @samp{JAVA}, @samp{SCRIPTS}, @samp{DATA},
address@hidden, @samp{MANS}, and @samp{TEXINFOS}.
address@hidden, @samp{LISP}, @samp{PYTHON}, @samp{JAVA},
address@hidden, @samp{DATA}, @samp{HEADERS}, @samp{MANS}, and
address@hidden
 @vindex PROGRAMS
 @vindex LIBRARIES
address@hidden LTLIBRARIES
 @vindex LISP
 @vindex PYTHON
 @vindex JAVA
@@ -7651,7 +7653,7 @@ as follows to Automake:
 
 @example
 pyexec_LTLIBRARIES = quaternion.la
-quaternion_SOURCES = quaternion.c support.c support.h
+quaternion_la_SOURCES = quaternion.c support.c support.h
 quaternion_la_LDFLAGS = -avoid-version -module
 @end example
 
diff --git a/tests/defs b/tests/defs
index 02f9ad0..134dc78 100644
--- a/tests/defs
+++ b/tests/defs
@@ -296,6 +296,7 @@ do
       ;;
     xsi-shell)
       # Try some XSI features.
+      # Keep this in sync with libtool.m4:_LT_CHECK_SHELL_FEATURES.
       echo "$me: trying some XSI constructs"
       ( _am_dummy="a/b/c"
        test 
"${_am_dummy##*/},${_am_dummy%/*},${_am_dummy#??}"${_am_dummy%"$_am_dummy"}, \


hooks/post-receive
-- 
GNU Automake