[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-2113-g84bf694

[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=84bf694bcba198d700a3214a0f1be7e24a6c8755

The branch, master has been updated
       via  84bf694bcba198d700a3214a0f1be7e24a6c8755 (commit)
       via  26a63b3be6f10afce917bcbc93c69aa80b29a919 (commit)
       via  feeb7f6a910bdf9ede9d0cc6a69040a3eb6d30d8 (commit)
      from  2e343fc7c69cee628a83759edc33f336eedfa1d0 (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 84bf694bcba198d700a3214a0f1be7e24a6c8755
Merge: 2e343fc 26a63b3
Author: Stefano Lattarini <address@hidden>
Date:   Wed Mar 28 22:50:27 2012 +0200

    Merge branch 'maint'
    
    * maint:
      cosmetics: don't make the generated Config.pm executable
      maint: reduce use of recursion in automake build system
    
    + Extra non-trivial extra edits follows.
    
    * lib/Makefile.am (amdir): Deleted this definition, it is already
    provided by a proper AC_SUBST in configure.ac.
    (dist_am_DATA): Remove 'am/ansi2knr.am', 'am/check-html.am' and
    'am/multilib.am'.
    (dist_perllib_DATA): Remove 'Automake/Struct.pm'.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 configure.ac             |    2 -
 lib/Automake/Makefile.am |   67 -----------------------------
 lib/Makefile.am          |  106 ++++++++++++++++++++++++++++++++++++++++++++-
 lib/am/Makefile.am       |   59 -------------------------
 4 files changed, 103 insertions(+), 131 deletions(-)
 delete mode 100644 lib/Automake/Makefile.am
 delete mode 100644 lib/am/Makefile.am

diff --git a/configure.ac b/configure.ac
index c8d5a34..e7b62e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -399,9 +399,7 @@ AC_CONFIG_FILES([
   Makefile
   contrib/Makefile
   doc/Makefile
-  lib/Automake/Makefile
   lib/Makefile
-  lib/am/Makefile
   m4/Makefile
   tests/Makefile
 ])
diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am
deleted file mode 100644
index b5c93b1..0000000
--- a/lib/Automake/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program 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 General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-perllibdir = $(pkgvdatadir)/Automake
-dist_perllib_DATA = \
-  ChannelDefs.pm \
-  Channels.pm \
-  Condition.pm \
-  Configure_ac.pm \
-  DisjConditions.pm \
-  FileUtils.pm \
-  General.pm \
-  Getopt.pm \
-  Item.pm \
-  ItemDef.pm \
-  Location.pm \
-  Options.pm \
-  Rule.pm \
-  RuleDef.pm \
-  Variable.pm \
-  VarDef.pm \
-  Version.pm \
-  XFile.pm \
-  Wrap.pm
-
-nodist_perllib_DATA = \
-  Config.pm
-
-CLEANFILES = $(nodist_perllib_DATA)
-
-## We can't use configure to do the substitution here; we must do it
-## by hand.  We use a funny notation here to avoid configure
-## substitutions in our text.
-do_subst = in=`echo $@ | sed 's/\.[^.]*$$//'`; sed \
-  -e 's,address@hidden@],$(APIVERSION),g' \
-  -e 's,address@hidden@],$(PACKAGE),g' \
-  -e 's,address@hidden@],$(PACKAGE_BUGREPORT),g' \
-  -e 's,address@hidden@],$(PERL),g' \
-  -e 's,address@hidden@],$(PERL_THREADS),g' \
-  -e 's,address@hidden@],$(SHELL),g' \
-  -e 's,address@hidden@],$(VERSION),g' \
-  -e "s,address@hidden@],Generated from $$in.in; do not edit by hand.,g" \
-  -e 's,address@hidden@],$(datadir),g'
-
-## This file depends on Makefile so it is rebuilt if $(VERSION),
-## $(datadir) or other do_subst'ituted variables change.
-## Use chmod a-w to prevent people from editing the wrong file by accident.
-Config.pm: Config.in Makefile
-       $(AM_V_at)rm -f $@ address@hidden
-       $(AM_V_GEN)$(do_subst) $(srcdir)/Config.in >address@hidden
-       $(AM_V_at)chmod a+x,a-w address@hidden && mv -f address@hidden $@
-
-EXTRA_DIST = Config.in
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f56db26..b7f23cd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -17,7 +17,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-SUBDIRS = Automake am
+EXTRA_DIST = gnupload gitlog-to-changelog update-copyright
+
+## -------------------------------------------------------------------- ##
+##  Auxiliary scripts and files for use with "automake --add-missing".  ##
+## -------------------------------------------------------------------- ##
 
 dist_pkgvdata_DATA = \
   COPYING \
@@ -44,8 +48,6 @@ dist_script_DATA = \
   tap-driver.sh \
   tap-driver.pl
 
-EXTRA_DIST = gnupload gitlog-to-changelog update-copyright
-
 install-data-hook:
        @$(POST_INSTALL)
        @for prog in $(dist_script_DATA); do \
@@ -60,3 +62,101 @@ installcheck-local:
        done \
          | sed 's/$$/: not executable/' \
          | grep . && exit 1; exit 0
+
+## ---------------------------------------------------- ##
+##  Private perl modules used by automake and aclocal.  ##
+## ---------------------------------------------------- ##
+
+perllibdir = $(pkgvdatadir)/Automake
+dist_perllib_DATA = \
+  Automake/ChannelDefs.pm \
+  Automake/Channels.pm \
+  Automake/Condition.pm \
+  Automake/Configure_ac.pm \
+  Automake/DisjConditions.pm \
+  Automake/FileUtils.pm \
+  Automake/General.pm \
+  Automake/Getopt.pm \
+  Automake/Item.pm \
+  Automake/ItemDef.pm \
+  Automake/Location.pm \
+  Automake/Options.pm \
+  Automake/Rule.pm \
+  Automake/RuleDef.pm \
+  Automake/Variable.pm \
+  Automake/VarDef.pm \
+  Automake/Version.pm \
+  Automake/XFile.pm \
+  Automake/Wrap.pm
+
+nodist_perllib_DATA = Automake/Config.pm
+CLEANFILES = $(nodist_perllib_DATA)
+
+## We can't use configure to do the substitution here; we must do it
+## by hand.  We use a funny notation here to avoid configure
+## substitutions in our text.
+do_subst = in=`echo $@ | sed 's/\.[^.]*$$//'`; sed \
+  -e 's,address@hidden@],$(APIVERSION),g' \
+  -e 's,address@hidden@],$(PACKAGE),g' \
+  -e 's,address@hidden@],$(PACKAGE_BUGREPORT),g' \
+  -e 's,address@hidden@],$(PERL),g' \
+  -e 's,address@hidden@],$(PERL_THREADS),g' \
+  -e 's,address@hidden@],$(SHELL),g' \
+  -e 's,address@hidden@],$(VERSION),g' \
+  -e "s,address@hidden@],Generated from $$in.in; do not edit by hand.,g" \
+  -e 's,address@hidden@],$(datadir),g'
+
+## This file depends on Makefile so it is rebuilt if $(VERSION),
+## $(datadir) or other do_subst'ituted variables change.
+## Use chmod a-w to prevent people from editing the wrong file by accident.
+Automake/Config.pm: Automake/Config.in Makefile
+       $(AM_V_at)rm -f $@ address@hidden
+       $(AM_V_at)test -d Automake || mkdir Automake
+       $(AM_V_GEN)$(do_subst) $(srcdir)/Automake/Config.in >address@hidden
+       $(AM_V_at)chmod a-w address@hidden && mv -f address@hidden $@
+EXTRA_DIST += Automake/Config.in
+
+## --------------------- ##
+##  Makefile fragments.  ##
+## --------------------- ##
+
+dist_am_DATA = \
+  am/check.am \
+  am/check2.am \
+  am/clean-hdr.am \
+  am/clean.am \
+  am/compile.am \
+  am/configure.am \
+  am/data.am \
+  am/dejagnu.am \
+  am/depend.am \
+  am/depend2.am \
+  am/distdir.am \
+  am/footer.am \
+  am/header-vars.am \
+  am/header.am \
+  am/install.am \
+  am/inst-vars.am \
+  am/java.am \
+  am/lang-compile.am \
+  am/lex.am \
+  am/library.am \
+  am/libs.am \
+  am/libtool.am \
+  am/lisp.am \
+  am/ltlib.am \
+  am/ltlibrary.am \
+  am/mans-vars.am \
+  am/mans.am \
+  am/program.am \
+  am/progs.am \
+  am/python.am \
+  am/remake-hdr.am \
+  am/scripts.am \
+  am/subdirs.am \
+  am/tags.am \
+  am/texi-vers.am \
+  am/texibuild.am \
+  am/texinfos.am \
+  am/vala.am \
+  am/yacc.am
diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
deleted file mode 100644
index ff4771c..0000000
--- a/lib/am/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-## Makefile for Automake lib/am.
-
-# Copyright (C) 1995-2012 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program 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 General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-dist_am_DATA = \
-check.am \
-check2.am \
-clean-hdr.am \
-clean.am \
-compile.am \
-configure.am \
-data.am \
-dejagnu.am \
-depend.am \
-depend2.am \
-distdir.am \
-footer.am \
-header-vars.am \
-header.am \
-install.am \
-inst-vars.am \
-java.am \
-lang-compile.am \
-lex.am \
-library.am \
-libs.am \
-libtool.am \
-lisp.am \
-ltlib.am \
-ltlibrary.am \
-mans-vars.am \
-mans.am \
-program.am \
-progs.am \
-python.am \
-remake-hdr.am \
-scripts.am \
-subdirs.am \
-tags.am \
-texi-vers.am \
-texibuild.am \
-texinfos.am \
-vala.am \
-yacc.am


hooks/post-receive
-- 
GNU Automake