[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12-343-g4526363

[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=45263630bcf83255f6a176cebd10e2ca0dcad618

The branch, ng/master has been updated
       via  45263630bcf83255f6a176cebd10e2ca0dcad618 (commit)
       via  e6af35514459fc2d9be800cdb3936daaefd13634 (commit)
      from  c853c205e7e7be5f5f369eb100762b74ddf766a3 (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 45263630bcf83255f6a176cebd10e2ca0dcad618
Author: Stefano Lattarini <address@hidden>
Date:   Wed May 30 10:37:50 2012 +0200

    [ng] fixup: really remove DJGPP support
    
    Follow-up on earlier patch 'v1.12-341-gc853c20'.
    
    * lib/am/texinfos.am (uninstall-info-am): Remove support for '*.iNN'
    files used on DJGPP.
    (maintainer-clean-aminfo): Likewise.
    * bootstrap.sh: Adjust comments: we don't use "ln -s" not because
    it's not properly supported by DJGPP, but because it might not be
    properly supported by MinGW/MSYS.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit e6af35514459fc2d9be800cdb3936daaefd13634
Author: Stefano Lattarini <address@hidden>
Date:   Wed May 30 09:25:59 2012 +0200

    [ng] general: assume dot-starting file names are supported
    
    Now that we've dropped support for DJGPP, Windows 95/98/ME and MS-DOS,
    that should always the case.
    
    * lib/am/texibuild.am: Just assume we can have directories whose name
    starts with a dot, i.e., that '${am__leading_dot}' expands to '.'.
    * m4/depend.m4 (AM_SET_DEPDIR): Likewise.  Now $(DEPDIR) will be set
    unconditionally to '.deps'.
    * m4/init.m4 (AM_INIT_AUTOMAKE): Don't AC_REQUIRE the m4 macro
    'AM_SET_LEADING_DOT' anymore.
    * m4/lead-dot.m4: Delete.
    * Makefile.am (dist_automake_ac_DATA): Remove it.
    * NG-NEWS: Update.
    * t/subobj11a.sh: Just assume $(DEPDIR) expands to '.deps'.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 Makefile.am         |    1 -
 NG-NEWS             |    6 ++++++
 bootstrap.sh        |    4 ++--
 lib/am/texibuild.am |    2 +-
 lib/am/texinfos.am  |   12 ++++--------
 m4/depend.m4        |    5 +----
 m4/init.m4          |    1 -
 m4/lead-dot.m4      |   21 ---------------------
 t/subobj11a.sh      |    8 +-------
 9 files changed, 15 insertions(+), 45 deletions(-)
 delete mode 100644 m4/lead-dot.m4

diff --git a/Makefile.am b/Makefile.am
index 533faef..51fb414 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -243,7 +243,6 @@ dist_automake_ac_DATA = \
   m4/gcj.m4 \
   m4/init.m4 \
   m4/install-sh.m4 \
-  m4/lead-dot.m4 \
   m4/lex.m4 \
   m4/lispdir.m4 \
   m4/maintainer.m4 \
diff --git a/NG-NEWS b/NG-NEWS
index ed36fe2..1e3c464 100644
--- a/NG-NEWS
+++ b/NG-NEWS
@@ -228,6 +228,12 @@ Obsolete Features Removed
   Of course, MinGW/MSYS and Cygwin on Windows 2000 and later are still
   fully supported.
 
+* Automake-generated Makefiles assume the target systems always support
+  file names starting with a dot; accordingly, the internal m4 macro
+  'AM_SET_LEADING_DOT' and AC_SUBST'd variable 'am__leading_dot' have
+  been removed.
+
+
 Source Files with Unknown Extensions
 ====================================
 
diff --git a/bootstrap.sh b/bootstrap.sh
index 0b7096a..278d118 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -64,8 +64,8 @@ if test -d automake-$APIVERSION; then
   find automake-$APIVERSION -exec chmod u+wx '{}' ';'
 fi
 rm -rf automake-$APIVERSION
-# Can't use "ln -s lib automake-$APIVERSION", that would create a
-# lib.exe stub under DJGPP 2.03.
+# Can't use "ln -s lib automake-$APIVERSION", that might not work
+# properly on MinGW/MSYS.
 mkdir automake-$APIVERSION
 cp -rf lib/* automake-$APIVERSION
 
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index 039e6de..10f5b36 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -25,7 +25,7 @@
 ## 2) If the texinfo file has some minor mistakes which cause makeinfo
 ##    to fail, the info files are not removed.  (They are needed by the
 ##    developer while he writes documentation.)
-       %AM_V_MAKEINFO%restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+       %AM_V_MAKEINFO%restore=: && backupdir=.am$$$$ && \
 ?INSRC?        am__cwd=`pwd` && $(am__cd) $(srcdir) && \
        rm -rf $$backupdir && mkdir $$backupdir && \
 ## If makeinfo is not installed we must not backup the files so
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 7a02232..c15b729 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -312,11 +312,9 @@ uninstall-info-am:
        @list='$(INFO_DEPS)'; \
        for file in $$list; do \
          relfile=`echo "$$file" | sed 's|^.*/||'`; \
-## DJGPP-style info files.  See comment in install-info-am.
-         relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
          (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then 
\
-            echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile 
$$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
-            rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] 
$$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
+            echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile 
$$relfile-[0-9] $$relfile-[0-9][0-9]"; \
+            rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9]; \
           else :; fi); \
        done
 
@@ -388,10 +386,8 @@ clean-aminfo:
 .PHONY maintainer-clean-am: maintainer-clean-aminfo
 maintainer-clean-aminfo:
        @list='$(INFO_DEPS)'; for i in $$list; do \
-## .iNN files are DJGPP-style info files.
-         i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
-         echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] 
$$i_i[0-9][0-9]"; \
-         rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
+         echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9]"; \
+         rm -f $$i $$i-[0-9] $$i-[0-9][0-9]; \
        done
 ## Use '-rf', not just '-f', because the %*CLEAN% substitutions can also
 ## contain any directory created by "makeinfo --html".
diff --git a/m4/depend.m4 b/m4/depend.m4
index 0c1112e..caa984b 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -159,10 +159,7 @@ AM_CONDITIONAL([am__fastdep$1], [
 # -------------
 # Choose a directory name for dependency files.
 # This macro is AC_REQUIREd in _AM_DEPENDENCIES.
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
+AC_DEFUN([AM_SET_DEPDIR], [AC_SUBST([DEPDIR], [.deps])])
 
 
 # AM_DEP_TRACK
diff --git a/m4/init.m4 b/m4/init.m4
index 0abf787..9d06c96 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -68,7 +68,6 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
                             [_AM_PROG_TAR([v7])])])
diff --git a/m4/lead-dot.m4 b/m4/lead-dot.m4
deleted file mode 100644
index 8a86805..0000000
--- a/m4/lead-dot.m4
+++ /dev/null
@@ -1,21 +0,0 @@
-##                                                          -*- Autoconf -*-
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
diff --git a/t/subobj11a.sh b/t/subobj11a.sh
index ae02e59..3dbf52b 100755
--- a/t/subobj11a.sh
+++ b/t/subobj11a.sh
@@ -63,13 +63,7 @@ $AUTOMAKE -a
 ./configure --enable-dependency-tracking
 
 $MAKE
-depdir=`sed -n 's/^ *DEPDIR *= *//p' Makefile`
-if test x"$depdir" != x; then
-  depdir=src/$depdir
-else
-  fatal_ "cannot extract value of DEPDIR from Makefile"
-fi
-
+depdir=src/.deps
 ls -l "$depdir"
 test -f "$depdir"/foo.Po
 


hooks/post-receive
-- 
GNU Automake