[Automake-ng] [PATCH] [ng] maint: rename automake -> automake-ng, aclocal -> aclocal-ng

[Stefano Lattarini]

With the aim of avoiding confusion between Automake and Automake-NG as
much as possible, we rename the 'automake' and 'aclocal' scripts in the
'ng/master' branch to 'automke-ng' and 'aclocal-ng' respectively, and
adjust the testsuite and the automatic remake rules accordingly.

* automake.in: Moved ...
* automake-ng.in: ... here.
* aclocal.in: Moved ...
* aclocal-ng.in: ... here.
* t/wrap/automake.in: Moved ...
* t/wrap/automake-ng.in: ... here, and adjusted.
* t/wrap/aclocal.in: Moved ...
* t/wrap/aclocal-ng.in: ... here, and adjusted.
* m4/init.m4, Makefile.am, configure.ac, bootstrap, defs-static.in,
t/get-sysconf.sh, t/location.sh, t/warnings-unknown.sh, .gitignore:
Adjust.

Signed-off-by: Stefano Lattarini <address@hidden>
---

 I will push to 'ng/master' by tomorrow if there are no objections.

 .gitignore                             |   12 +++----
 Makefile.am                            |   55 ++++++++++++++++----------------
 aclocal.in => aclocal-ng.in            |    0
 automake.in => automake-ng.in          |    0
 bootstrap                              |   36 ++++++++++-----------
 configure.ac                           |   14 ++++----
 defs-static.in                         |    4 +--
 m4/init.m4                             |    4 +--
 t/get-sysconf.sh                       |    4 +--
 t/location.sh                          |    8 ++---
 t/warnings-unknown.sh                  |    4 +--
 t/wrap/{aclocal.in => aclocal-ng.in}   |    6 ++--
 t/wrap/{automake.in => automake-ng.in} |    3 +-
 13 files changed, 77 insertions(+), 73 deletions(-)
 rename aclocal.in => aclocal-ng.in (100%)
 rename automake.in => automake-ng.in (100%)
 rename t/wrap/{aclocal.in => aclocal-ng.in} (87%)
 rename t/wrap/{automake.in => automake-ng.in} (92%)

diff --git a/.gitignore b/.gitignore
index 87dc8e7..82df13b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,8 +9,8 @@
 /config.status
 /config.status.lineno
 /configure.lineno
-/aclocal
-/automake
+/aclocal-ng
+/automake-ng
 /doc/.dirstamp
 /doc/automake*.info
 /doc/automake*.info-[0-9]
@@ -18,8 +18,8 @@
 /doc/automake*.dvi
 /doc/automake*.pdf
 /doc/automake*.ps
-/doc/automake*.1
-/doc/aclocal*.1
+/doc/automake-ng*.1
+/doc/aclocal-ng*.1
 /doc/stamp-vti
 /doc/version.texi
 /doc/amhello-*.tar.gz
@@ -33,8 +33,8 @@
 /doc/amhello/missing
 /lib/Automake/Config.pm
 /test-suite.log
-/t/wrap/aclocal-0.*
-/t/wrap/automake-0.*
+/t/wrap/aclocal-ng-[0-9].*
+/t/wrap/automake-ng-[0-9].*
 /defs-static
 /t/testsuite-part.am
 /t/*-w.tap
diff --git a/Makefile.am b/Makefile.am
index 6b5695c..b797ca8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-## Process this file with automake to create Makefile.in
+## Process this file with automake-ng to create Makefile.in
 
 ## Makefile for Automake.
 
@@ -58,11 +58,10 @@ generated_file_finalize = $(AM_V_at) \
   fi; \
   chmod a-w address@hidden && mv -f address@hidden $@
 
-bin_SCRIPTS = automake aclocal
-
+bin_SCRIPTS = automake-ng aclocal-ng
 CLEANFILES += $(bin_SCRIPTS)
-AUTOMAKESOURCES = automake.in aclocal.in
 
+AUTOMAKESOURCES = $(bin_SCRIPTS:=.in)
 TAGS_FILES = $(AUTOMAKESOURCES)
 
 EXTRA_DIST += \
@@ -107,9 +106,9 @@ uninstall-hook:
 
 ## These files depend on Makefile so they are rebuilt if $(VERSION),
 ## $(datadir) or other do_subst'ituted variables change.
-automake: automake.in
-aclocal: aclocal.in
-automake aclocal: Makefile
+automake-ng: automake-ng.in
+aclocal-ng: aclocal-ng.in
+automake-ng aclocal-ng: Makefile
        $(AM_V_at)rm -f $@ address@hidden
        $(AM_V_GEN)address@hidden; $(do_subst) <$(srcdir)/address@hidden 
>address@hidden
 ## We can't use '$(generated_file_finalize)' here, because currently
@@ -129,9 +128,9 @@ maintainer-clean-local:
        rm -rf .autom4te.cache
 
 
-## -------------------------------------------------------------------- ##
-##  Auxiliary scripts and files for use with "automake --add-missing".  ##
-## -------------------------------------------------------------------- ##
+## ---------------------------------------------------------------------- ##
+##  Auxiliary scripts and files installed by "automake-ng --add-missing"  ##
+## ---------------------------------------------------------------------- ##
 
 dist_pkgvdata_DATA = \
   lib/COPYING \
@@ -181,9 +180,9 @@ installcheck-executable-scripts:
          | grep . 1>&2 && exit 1; exit 0
 
 
-## ---------------------------------------------------- ##
-##  Private perl modules used by automake and aclocal.  ##
-## ---------------------------------------------------- ##
+## ---------------------------------------------------------- ##
+##  Private perl modules used by automake-ng and aclocal-ng.  ##
+## ---------------------------------------------------------- ##
 
 perllibdir = $(pkgvdatadir)/Automake
 dist_perllib_DATA = \
@@ -397,7 +396,9 @@ $(generated_TESTS) $(srcdir)/t/testsuite-part.am: \
   $(handwritten_TESTS)
 
 # Static dependencies valid for each test case.
-check_SCRIPTS = t/wrap/aclocal-$(APIVERSION) t/wrap/automake-$(APIVERSION)
+check_SCRIPTS = \
+  t/wrap/aclocal-ng-$(APIVERSION) \
+  t/wrap/automake-ng-$(APIVERSION)
 dist_check_DATA = t/ax/plain-functions.sh t/ax/tap-functions.sh
 check_DATA = defs defs-static
 
@@ -459,10 +460,10 @@ doc_automake_TEXINFOS = doc/fdl.texi
 doc_automake_history_TEXINFOS = doc/fdl.texi
 
 man1_MANS = \
-  doc/aclocal.1 \
-  doc/automake.1 \
-  doc/aclocal-$(APIVERSION).1 \
-  doc/automake-$(APIVERSION).1
+  doc/aclocal-ng.1 \
+  doc/automake-ng.1 \
+  doc/aclocal-ng-$(APIVERSION).1 \
+  doc/automake-ng-$(APIVERSION).1
 
 $(man1_MANS): $(srcdir)/configure.ac
 
@@ -476,16 +477,16 @@ update_mans = \
     && export PATH \
     && $(PERL) $(srcdir)/doc/help2man --output=$@
 
-doc/aclocal.1 doc/automake.1:
+doc/aclocal-ng.1 doc/automake-ng.1:
        $(AM_V_GEN): \
          && $(MKDIR_P) doc \
          && f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'` \
          && echo ".so man1/$$f-$(APIVERSION).1" > $@
 
-doc/aclocal-$(APIVERSION).1: aclocal.in aclocal lib/Automake/Config.pm
-       $(update_mans) aclocal-$(APIVERSION)
-doc/automake-$(APIVERSION).1: automake.in automake lib/Automake/Config.pm
-       $(update_mans) automake-$(APIVERSION)
+doc/aclocal-ng-$(APIVERSION).1: aclocal-ng lib/Automake/Config.pm
+       $(update_mans) aclocal-ng-$(APIVERSION)
+doc/automake-$(APIVERSION).1: automake-ng lib/Automake/Config.pm
+       $(update_mans) automake-ng-$(APIVERSION)
 
 
 ## ---------------------------- ##
@@ -515,15 +516,15 @@ dist_doc_DATA = $(srcdir)/doc/amhello-1.0.tar.gz
 
 # We depend on configure.ac so that we regenerate the tarball
 # whenever the Automake version changes.
-# aclocal-$(APIVERSION) and automake-$(APIVERSION) are generated by
-# configure in 't/wrap'.
+# aclocal-ng-$(APIVERSION) and automake-ng-$(APIVERSION) are
+# generated by configure in 't/wrap'.
 $(srcdir)/doc/amhello-1.0.tar.gz: $(amhello_sources) $(srcdir)/configure.ac
        $(AM_V_GEN): \
          && PATH="$(abs_top_builddir)/t/wrap$(PATH_SEPARATOR)$$PATH" \
          && export PATH \
          && $(am__cd) $(srcdir)/doc/amhello \
-         && ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL \
-         && AUTOMAKE=automake-$(APIVERSION) && export AUTOMAKE \
+         && ACLOCAL=aclocal-ng-$(APIVERSION) && export ACLOCAL \
+         && AUTOMAKE=automake-ng-$(APIVERSION) && export AUTOMAKE \
          && AUTOCONF='$(am_AUTOCONF)' && export AUTOCONF \
          && AUTOM4TE='$(am_AUTOM4TE)' && export AUTOM4TE \
          && AUTORECONF='$(am_AUTORECONF)' && export AUTORECONF \
diff --git a/aclocal.in b/aclocal-ng.in
similarity index 100%
rename from aclocal.in
rename to aclocal-ng.in
diff --git a/automake.in b/automake-ng.in
similarity index 100%
rename from automake.in
rename to automake-ng.in
diff --git a/bootstrap b/bootstrap
index 814aedb..6a0222a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -33,7 +33,7 @@ export AUTOM4TE  # ditto
 
 # Variables to substitute.
 VERSION=`sed -ne '/AC_INIT/s/^[^[]*\[[^[]*\[\([^]]*\)\].*$/\1/p' configure.ac`
-PACKAGE=automake
+PACKAGE=automake-ng
 datadir=.
 PERL_THREADS=0
 
@@ -62,16 +62,16 @@ if test -z "$APIVERSION"; then
 fi
 
 # Make a dummy versioned directory for aclocal.
-rm -rf aclocal-$APIVERSION
-mkdir aclocal-$APIVERSION
-if test -d automake-$APIVERSION; then
-  find automake-$APIVERSION -exec chmod u+wx '{}' ';'
+rm -rf aclocal-ng-$APIVERSION
+mkdir aclocal-ng-$APIVERSION
+if test -d automake-ng-$APIVERSION; then
+  find automake-ng-$APIVERSION -exec chmod u+wx '{}' ';'
 fi
-rm -rf automake-$APIVERSION
-# Can't use "ln -s lib automake-$APIVERSION", that would create a
+rm -rf automake-ng-$APIVERSION
+# Can't use "ln -s lib automake-ng-$APIVERSION", that would create a
 # lib.exe stub under DJGPP 2.03.
-mkdir automake-$APIVERSION
-cp -rf lib/* automake-$APIVERSION
+mkdir automake-ng-$APIVERSION
+cp -rf lib/* automake-ng-$APIVERSION
 
 dosubst ()
 {
@@ -90,17 +90,17 @@ dosubst ()
 }
 
 # Create temporary replacement for lib/Automake/Config.pm.
-dosubst automake-$APIVERSION/Automake/Config.in \
-        automake-$APIVERSION/Automake/Config.pm
+dosubst automake-ng-$APIVERSION/Automake/Config.in \
+        automake-ng-$APIVERSION/Automake/Config.pm
 
-# Create temporary replacement for aclocal.
-dosubst aclocal.in aclocal.tmp
+# Create temporary replacement for aclocal-ng.
+dosubst aclocal-ng.in aclocal-ng.tmp
 
 # Overwrite amversion.m4.
 dosubst m4/amversion.in m4/amversion.m4
 
 # Create temporary replacement for automake.
-dosubst automake.in automake.tmp
+dosubst automake-ng.in automake-ng.tmp
 
 # Create required makefile snippets.
 $PERL ./gen-testsuite-part > t/testsuite-part.tmp
@@ -110,10 +110,10 @@ mv -f t/testsuite-part.tmp t/testsuite-part.am
 # Run the autotools.
 # Use '-I' here so that our own *.m4 files in m4/ gets included,
 # not copied, in aclocal.m4.
-$PERL ./aclocal.tmp -I m4 --automake-acdir m4 --system-acdir m4/acdir
+$PERL ./aclocal-ng.tmp -I m4 --automake-acdir m4 --system-acdir m4/acdir
 $AUTOCONF
-$PERL ./automake.tmp
+$PERL ./automake-ng.tmp
 
 # Remove temporary files and directories.
-rm -rf aclocal-$APIVERSION automake-$APIVERSION
-rm -f aclocal.tmp automake.tmp
+rm -rf aclocal-ng-$APIVERSION automake-ng-$APIVERSION
+rm -f aclocal-ng.tmp automake-ng.tmp
diff --git a/configure.ac b/configure.ac
index 8d66a75..d92603e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
 AC_PREREQ([2.68])
 AC_INIT([GNU Automake-NG], [0.5a], address@hidden)
 
-AC_CONFIG_SRCDIR([automake.in])
+AC_CONFIG_SRCDIR([automake-ng.in])
 AC_CONFIG_AUX_DIR([lib])
 
 AM_SILENT_RULES([yes])
@@ -60,8 +60,8 @@ AC_SUBST([system_acdir], ["\${datadir}/aclocal"])
 
 # $AUTOMAKE and $ACLOCAL are always run after a "cd $top_srcdir",
 # hence '.' is really what we want for perllibdir, libdir, and acdir.
-ACLOCAL="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/aclocal\" 
--acdir=m4 -I m4"
-AUTOMAKE="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/automake\" 
--libdir=lib"
+ACLOCAL="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/aclocal-ng\" 
--acdir=m4 -I m4"
+AUTOMAKE="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/automake-ng\" 
--libdir=lib"
 
 AC_PATH_PROG([PERL], [perl])
 if test -z "$PERL"; then
@@ -397,11 +397,11 @@ AC_CONFIG_FILES([Makefile])
 AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])
 AC_CONFIG_LINKS([defs:defs])
 
-AC_CONFIG_FILES([t/wrap/aclocal-${APIVERSION}:t/wrap/aclocal.in],
-                [chmod +x t/wrap/aclocal-${APIVERSION}],
+AC_CONFIG_FILES([t/wrap/aclocal-ng-${APIVERSION}:t/wrap/aclocal-ng.in],
+                [chmod +x t/wrap/aclocal-ng-${APIVERSION}],
                [APIVERSION=$APIVERSION])
-AC_CONFIG_FILES([t/wrap/automake-${APIVERSION}:t/wrap/automake.in],
-                [chmod +x t/wrap/automake-${APIVERSION}],
+AC_CONFIG_FILES([t/wrap/automake-ng-${APIVERSION}:t/wrap/automake-ng.in],
+                [chmod +x t/wrap/automake-ng-${APIVERSION}],
                [APIVERSION=$APIVERSION])
 
 AC_OUTPUT
diff --git a/defs-static.in b/defs-static.in
index a8a17f0..b5cf364 100644
--- a/defs-static.in
+++ b/defs-static.in
@@ -160,10 +160,10 @@ 
AUTOUPDATE=${AM_TESTSUITE_AUTOUPDATE-${AUTOUPDATE-'@am_AUTOUPDATE@'}}
 # "test -z" tests take care not to re-initialize them if defs-static
 # is re-sourced, as we want defs-static to remain really idempotent.
 if test -z "$am_original_AUTOMAKE"; then
-  
am_original_AUTOMAKE=${AM_TESTSUITE_AUTOMAKE-${AUTOMAKE-"automake-$APIVERSION"}}
+  
am_original_AUTOMAKE=${AM_TESTSUITE_AUTOMAKE-${AUTOMAKE-"automake-ng-$APIVERSION"}}
 fi
 if test -z "$am_original_ACLOCAL"; then
-  am_original_ACLOCAL=${AM_TESTSUITE_ACLOCAL-${ACLOCAL-"aclocal-$APIVERSION"}}
+  
am_original_ACLOCAL=${AM_TESTSUITE_ACLOCAL-${ACLOCAL-"aclocal-ng-$APIVERSION"}}
 fi
 
 # Use -Werror because this also turns some Perl warnings into error.
diff --git a/m4/init.m4 b/m4/init.m4
index ef0d3da..428722c 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -71,9 +71,9 @@ _AM_IF_OPTION([no-define],,
 # Some tools Automake-NG needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([ACLOCAL], [aclocal-ng-${am__api_version}])
 AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOMAKE], [automake-ng-${am__api_version}])
 AM_MISSING_PROG([AUTOHEADER], [autoheader])
 AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
diff --git a/t/get-sysconf.sh b/t/get-sysconf.sh
index ac09a63..ac84d75 100755
--- a/t/get-sysconf.sh
+++ b/t/get-sysconf.sh
@@ -47,8 +47,8 @@ $PERL -V || st=1
 $PERL -e 'use TAP::Parser; print $TAP::Parser::VERSION, "\n"' || :
 
 cat "$am_top_builddir/config.log" || st=1
-cat "$am_top_builddir/t/wrap/aclocal-$APIVERSION" || st=1
-cat "$am_top_builddir/t/wrap/automake-$APIVERSION" || st=1
+cat "$am_top_builddir/t/wrap/aclocal-ng-$APIVERSION" || st=1
+cat "$am_top_builddir/t/wrap/automake-ng-$APIVERSION" || st=1
 
 if test $st -eq 0; then
   # This test SKIPs, so that all the information it has gathered and
diff --git a/t/location.sh b/t/location.sh
index e496ca6..35188fa 100755
--- a/t/location.sh
+++ b/t/location.sh
@@ -51,7 +51,7 @@ smash_useless_diffs ()
   # FIXME: we could get rid of the second 's|||' once we improve our
   # wrapper scripts ...
   sed -e "s|^$am_amdir/\\([a-z]*\.am\\)|\\1|" \
-      -e "s|^automake-$APIVERSION:|automake:|" ${1+"$@"};
+      -e "s|^automake-ng-$APIVERSION:|automake-ng:|" ${1+"$@"}
 }
 
 $ACLOCAL
@@ -62,9 +62,9 @@ smash_useless_diffs stderr >observed
 cat >expected <<\EOF
 Makefile.am:12: warning: VAR multiply defined in condition TRUE ...
 Makefile.am:8: ... 'VAR' previously defined here
-automake: error: libfoo_a_OBJECTS should not be defined
+automake-ng: error: libfoo_a_OBJECTS should not be defined
 Makefile.am:3:   while processing library 'libfoo.a'
-automake: error: use 'libfoo_a_LDADD', not 'libfoo_a_LIBADD'
+automake-ng: error: use 'libfoo_a_LDADD', not 'libfoo_a_LIBADD'
 Makefile.am:3:   while processing library 'libfoo.a'
 library.am: warning: deprecated feature: target 'libfoo.a' overrides 
'libfoo.a$(EXEEXT)'
 library.am: change your target to read 'libfoo.a$(EXEEXT)'
@@ -86,7 +86,7 @@ diff expected observed || Exit 1
 
 AUTOMAKE_fails -Werror
 smash_useless_diffs stderr >observed
-(echo 'automake: warnings are treated as errors' && cat expected) > t
+(echo 'automake-ng: warnings are treated as errors' && cat expected) > t
 mv -f t expected
 
 cat expected
diff --git a/t/warnings-unknown.sh b/t/warnings-unknown.sh
index 4d64059..d6110b0 100755
--- a/t/warnings-unknown.sh
+++ b/t/warnings-unknown.sh
@@ -35,12 +35,12 @@ $ACLOCAL
 
 AUTOMAKE_fails -Wbazquux
 # FIXME: we could get rid of this once we improve our wrapper scripts.
-sed "s/^automake:/automake-$APIVERSION:/" stderr > t
+sed "s/^automake-ng:/automake-ng-$APIVERSION:/" stderr > t
 mv -f t stderr
 cat stderr >&2
 grep '^configure\.ac:2:.* unknown warning category.*zardoz' stderr
 grep '^Makefile\.am:1:.* unknown warning category.*foobar' stderr
-grep "^automake-$APIVERSION:.* unknown warning category.*bazquux" stderr
+grep "^automake-ng-$APIVERSION:.* unknown warning category.*bazquux" stderr
 
 # Check that we can override warnings about unknown warning categories.
 $AUTOMAKE -Wno-unsupported -Wbazquux
diff --git a/t/wrap/aclocal.in b/t/wrap/aclocal-ng.in
similarity index 87%
rename from t/wrap/aclocal.in
rename to t/wrap/aclocal-ng.in
index 18ee13a..1026fc0 100644
--- a/t/wrap/aclocal.in
+++ b/t/wrap/aclocal-ng.in
@@ -28,5 +28,7 @@ fi
 perllibdir="@abs_top_builddir@/address@hidden@@abs_top_srcdir@/lib"
 export perllibdir
 
-exec "@abs_top_builddir@/aclocal" "address@hidden@/m4" \
-     "address@hidden@/m4/acdir" ${1+"$@"}
+exec "@abs_top_builddir@/aclocal-ng" \
+     "address@hidden@/m4" \
+     "address@hidden@/m4/acdir" \
+     ${1+"$@"}
diff --git a/t/wrap/automake.in b/t/wrap/automake-ng.in
similarity index 92%
rename from t/wrap/automake.in
rename to t/wrap/automake-ng.in
index 14f437f..6089a62 100644
--- a/t/wrap/automake.in
+++ b/t/wrap/automake-ng.in
@@ -27,4 +27,5 @@ fi
 
 perllibdir="@abs_top_builddir@/address@hidden@@abs_top_srcdir@/lib"
 export perllibdir
-exec "@abs_top_builddir@/automake" "address@hidden@/lib" ${1+"$@"}
+exec "@abs_top_builddir@/automake-ng" \
+     "address@hidden@/lib" ${1+"$@"}
-- 
1.7.9.5