From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 5 Aug 2012 16:24:32 +0000 (+0200)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3080a80c7b4378b9d15559b0c2cdcc5fa0a26596;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master: (23 commits)
  tests: avoid spurious failures with older Texinfo
  tests: avoid tons of spurious failures on NetBSD
  runtest: avoid spurious failures on NetBSD
  news: dependency tracking for Portland Group Compilers is now supported
  tests: cater to OpenSolaris 'zip'
  tests: fix a spurious XPASS on OpenIndiana
  tests: avoid spurious failure of 't/vala-vapi.sh' on OpenIndiana
  tests: avoid spurious failure of 't/uninstall-fail.sh' on OpenIndiana
  tests: reimplement wrappers for automake and aclocal in perl
  tests: work around a ksh bug w.r.t. ${1+"$@"}
  news: document all the recent elisp-related changes and improvements
  coverage: byte-compiling elisp files in different subdirectories
  elisp: honour AM_ELCFLAFS and ELCFLAGS in byte-compilation
  elisp: --batch implies -q, remove -q
  elisp: support elisp files in subdirectories properly
  elisp: simplify suffix rules using emacs '-L' option
  elisp: no need to "absolutize" $(srcdir) and $(builddir) ...
  elisp: prefer $(builddir) files over $(srcdir) ones
  elisp: use suffix rules, get rid of 'elisp-comp' script (mostly a rewrite)
  coverage: elisp path contains $(srcdir) and $(builddir)
  ...

+ Extra non-trivial edits:
* lib/am/lisp.am (am.clean.normal.f): Add 'elc-stamp' no more.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

3080a80c7b4378b9d15559b0c2cdcc5fa0a26596
diff --cc Makefile.am
index a6603099d,e6297870a..1c26bc3a6
--- a/Makefile.am
+++ b/Makefile.am
@@@ -122,7 -134,7 +122,6 @@@ dist_script_DATA = 
    lib/install-sh \
    lib/mdate-sh \
    lib/missing \
-   lib/elisp-comp \
 -  lib/mkinstalldirs \
    lib/ylwrap \
    lib/depcomp \
    lib/compile \
diff --cc automake.in
index d8e51d494,91133bd53..f7bfea379
--- a/automake.in
+++ b/automake.in
@@@ -202,41 -222,18 +202,40 @@@ use constant MAINTAINER_CLEAN => 3
  
  # Libtool files.
  my @libtool_files = qw(ltmain.sh config.guess config.sub);
 -# ltconfig appears here for compatibility with old versions of libtool.
 -my @libtool_sometimes = qw(ltconfig ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh);
  
  # Commonly found files we look for and automatically include in
 -# DISTFILES.
 -my @common_files =
 -    (qw(ABOUT-GNU ABOUT-NLS AUTHORS BACKLOG COPYING COPYING.DOC COPYING.LIB
 -	COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO
 -	ar-lib compile config.guess config.rpath
 -	config.sub depcomp install-sh libversion.in mdate-sh
 -	missing mkinstalldirs py-compile texinfo.tex ylwrap),
 -     @libtool_files, @libtool_sometimes);
 +# distributed files.
 +my @common_files = (
 +  qw(
 +    ABOUT-GNU
 +    ABOUT-NLS
 +    AUTHORS
 +    COPYING
 +    COPYING.DOC
 +    COPYING.LIB
 +    COPYING.LESSER
 +    ChangeLog
 +    INSTALL
 +    NEWS
 +    README
 +    THANKS
 +    TODO
 +    ar-lib
 +    compile
 +    config.guess
 +    config.rpath
 +    config.sub
 +    depcomp
-     elisp-comp
 +    install-sh
 +    libversion.in
 +    mdate-sh
 +    missing
 +    py-compile
 +    texinfo.tex
 +    ylwrap
 +  ),
 +  @libtool_files,
 +);
  
  # Commonly used files we auto-include, but only sometimes.  This list
  # is used for the --help output only.
diff --cc lib/am/lisp.am
index cf9b8cf47,fc3575b85..cb8f1839a
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@@ -142,7 -110,10 +110,7 @@@ endif %?INSTALL
  ## Cleaning.  ##
  ## ---------- ##
  
- am.clean.normal.f += elc-stamp $(ELCFILES)
 -.PHONY clean-am: clean-lisp
 -clean-lisp:
 -	-rm -f $(ELCFILES)
 -
++am.clean.normal.f += $(ELCFILES)
  
  ## -------------- ##
  ## Distributing.  ##
diff --cc t/primary-prefix-valid-couples.sh
index d7efb98cd,1890369ac..23f309452
--- a/t/primary-prefix-valid-couples.sh
+++ b/t/primary-prefix-valid-couples.sh
@@@ -38,10 -38,9 +38,9 @@@ AC_DEFUN([AC_PROG_LIBTOOL]
  END
  
  # Other required files.
 -echo '@setfilename foo' > foo.texi
 +echo '@setfilename foo.info' > foo.texi
  : > texinfo.tex
  : > py-compile
- : > elisp-comp
  : > ar-lib
  
  # Setup Makefile.am.