From: Akim Demaille <akim@epita.fr>
Date: Fri, 5 Oct 2001 16:12:06 +0000 (+0000)
Subject: * Makefile.am, config/Makefile.am, lib/emacs/Makefile.am,
X-Git-Tag: AUTOCONF-2.52f~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3594d53cb2d9b0948ff0bd35fa47b5cdfacf9a3;p=thirdparty%2Fautoconf.git

* Makefile.am, config/Makefile.am, lib/emacs/Makefile.am,
* m4/Makefile.am, man/Makefile.am: Add/adjust MAINTAINERCLEANFILES.
---

diff --git a/ChangeLog b/ChangeLog
index 550954414..740c6139a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-10-05  Akim Demaille  <akim@epita.fr>
+
+	* Makefile.am, config/Makefile.am, lib/emacs/Makefile.am,
+	* m4/Makefile.am, man/Makefile.am: Add/adjust MAINTAINERCLEANFILES.
+
+2001-10-05  Akim Demaille  <akim@epita.fr>
+
+	* lib/m4sugar/m4sh.m4 (_AS_LINENO_PREPARE): New, extracted from...
+	(AS_SHELL_SANITIZE): here.  Use it.
+	(_AS_LINENO_PREPARE): Preserve the exit status of $0.lineno.
+	From Paul Eggert.
+
 2001-10-04  Akim Demaille  <akim@epita.fr>
 
 	* lib/m4sugar/m4sh.m4 (AS_SHELL_SANITIZE): Use a portable
diff --git a/Makefile.am b/Makefile.am
index 5328e5ca1..dcffbf5b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,8 @@ EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
 AMTAR = @AMTAR@
 AWK   = @AWK@
 
+MAINTAINERCLEANFILES = COPYING INSTALL configure
+
 ## -------------------- ##
 ## Forwarding targets.  ##
 ## -------------------- ##
diff --git a/Makefile.in b/Makefile.in
index f2f295077..238646618 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,6 +78,8 @@ EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
 AMTAR = @AMTAR@
 AWK = @AWK@
 
+MAINTAINERCLEANFILES = COPYING INSTALL configure
+
 pkgdata_DATA = INSTALL
 MAKEINFO = @MAKEINFO@ --no-headers --no-validate --no-split
 
@@ -356,6 +358,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-recursive
 
 clean-am: clean-generic mostlyclean-am
diff --git a/config/Makefile.am b/config/Makefile.am
index 02f2cc74f..88935e4ad 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1 +1,24 @@
+## Process this file with automake to create Makefile.in -*-Makefile-*-
+
+## Makefile for Autoconf.
+## Copyright 2001 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, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+## 02111-1307, USA.
+
 EXTRA_DIST = move-if-change prev-version.txt
+
+MAINTAINERCLEANFILES = config.guess config.sub install-sh mdate-sh missing \
+                       mkinstalldirs texinfo.tex
diff --git a/config/Makefile.in b/config/Makefile.in
index 3536dd9ab..702577b72 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -64,6 +64,10 @@ PERL = @PERL@
 VERSION = @VERSION@
 
 EXTRA_DIST = move-if-change prev-version.txt
+
+MAINTAINERCLEANFILES = config.guess config.sub install-sh mdate-sh missing \
+                       mkinstalldirs texinfo.tex
+
 subdir = config
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES =
@@ -135,6 +139,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
diff --git a/lib/emacs/Makefile.am b/lib/emacs/Makefile.am
index 5b9aa75eb..b48afeff4 100644
--- a/lib/emacs/Makefile.am
+++ b/lib/emacs/Makefile.am
@@ -18,3 +18,4 @@
 ## 02111-1307, USA.
 
 dist_lisp_LISP = autoconf-mode.el autotest-mode.el
+MAINTAINERCLEANFILES = elisp-comp
diff --git a/lib/emacs/Makefile.in b/lib/emacs/Makefile.in
index ebd0ffef1..9ed8947c5 100644
--- a/lib/emacs/Makefile.in
+++ b/lib/emacs/Makefile.in
@@ -64,6 +64,7 @@ PERL = @PERL@
 VERSION = @VERSION@
 
 dist_lisp_LISP = autoconf-mode.el autotest-mode.el
+MAINTAINERCLEANFILES = elisp-comp
 subdir = lib/emacs
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES =
@@ -176,6 +177,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic clean-lisp mostlyclean-am
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index b67fa5cd6..6a0c7349c 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -92,6 +92,7 @@ m4_copy([_m4_divert(M4SH-INIT)], [_m4_divert(NOTICE)])
 ## 1. Sanitizing the shell.  ##
 ## ------------------------- ##
 
+
 # AS_SHELL_SANITIZE
 # -----------------
 # Try to be as Bourne and/or POSIX as possible.
@@ -112,52 +113,8 @@ fi
 # Name of the executable.
 as_me=`AS_BASENAME($[0])`
 
-# If LINENO is not supported by the shell, produce a version of this
-# script where LINENO is hard coded.  Rewrite if not up to date only.
-# Comparing LINENO against _oline_ is not a good solution, since in
-# the case of embedded executables (such as config.status within
-# configure) you'd compare LINENO wrt config.status vs. _oline_ vs
-# configure.  Hence a useless rewrite (not to mention the risk of
-# ``infinite'' rewrites.  Merely check that LINENO is incremented
-# between two lines, which is a property guaranteed for _oline_, hence
-# it protects us from repetitive rewrites.  Be sure to have a test
-# that does detect non LINENO support...
-as_lineno_1=$LINENO
-as_lineno_2=$LINENO
-as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-if test "x$as_lineno_1"  = "x$as_lineno_2" ||
-   test "x$as_lineno_3" != "x$as_lineno_2";
-  then
-  # Find who we are.
-  case $[0] in
-    *[[\\/]]* | ?:[[\\/]]* ) as_myself=$[0] ;;
-    *) _AS_PATH_WALK([],
-                   [test -r "$as_dir/$[0]" && as_myself=$as_dir/$[0] && break])
-       ;;
-  esac
-  if test ! -f $as_myself; then
-    AS_ERROR([cannot find myself; rerun with an absolute path])
-  fi
-  if test ! -f $as_me.lineno ||
-     test x`ls -1dt $as_me.lineno $as_myself 2>/dev/null | sed 1q` \
-                != x$as_me.lineno; then
-     # Be sure to write the pattern so that it doesn't replace itself:
-     # it must not match itself.
-     awk <$as_myself '
-           /[[$]]LINENO/ { printf "%d:", NR }
-                         { print }
-         ' |
-       sed ['/[$]LINENO/s/^\([0-9][0-9]*\):\(.*\)[$]LINENO/\2\1/'] \
-         >$as_me.lineno
-    chmod +x $as_me.lineno
-  fi
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  exit 0
-fi
+# Rewrite early.
+_AS_LINENO_PREPARE
 
 _AS_CR_PREPARE
 _AS_ECHO_N_PREPARE
@@ -450,6 +407,59 @@ fi
 ])# _AS_EXPR_PREPARE
 
 
+# _AS_LINENO_PREPARE
+# ------------------
+# If LINENO is not supported by the shell, produce a version of this
+# script where LINENO is hard coded.  Rewrite if not up to date only.
+# Comparing LINENO against _oline_ is not a good solution, since in
+# the case of embedded executables (such as config.status within
+# configure) you'd compare LINENO wrt config.status vs. _oline_ vs
+# configure.  Hence a useless rewrite (not to mention the risk of
+# ``infinite'' rewrites.  Merely check that LINENO is incremented
+# between two lines, which is a property guaranteed for _oline_, hence
+# it protects us from repetitive rewrites.  Be sure to have a test
+# that does detect non LINENO support...
+m4_define([_AS_LINENO_PREPARE],
+[as_lineno_1=$LINENO
+as_lineno_2=$LINENO
+as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+if test "x$as_lineno_1"  = "x$as_lineno_2" ||
+   test "x$as_lineno_3" != "x$as_lineno_2";
+  then
+  # Find who we are.
+  case $[0] in
+    *[[\\/]]* | ?:[[\\/]]* ) as_myself=$[0] ;;
+    *) _AS_PATH_WALK([],
+                   [test -r "$as_dir/$[0]" && as_myself=$as_dir/$[0] && break])
+       ;;
+  esac
+  if test ! -f $as_myself; then
+    AS_ERROR([cannot find myself; rerun with an absolute path])
+  fi
+  if test ! -f $as_me.lineno ||
+     test x`ls -1dt $as_me.lineno $as_myself 2>/dev/null | sed 1q` \
+                != x$as_me.lineno; then
+     # Be sure to write the pattern so that it doesn't replace itself:
+     # it must not match itself.
+     awk <$as_myself '
+           /[[$]]LINENO/ { printf "%d:", NR }
+                         { print }
+         ' |
+       sed ['/[$]LINENO/s/^\([0-9][0-9]*\):\(.*\)[$]LINENO/\2\1/'] \
+         >$as_me.lineno
+    chmod +x $as_me.lineno
+  fi
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+fi
+])# _AS_LINENO_PREPARE
+
+
 # _AS_LN_S_PREPARE
 # ----------------
 # Don't use conftest.sym to avoid filename issues on DJGPP, where this
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 5a7b20654..04aacd549 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -18,14 +18,19 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-EXTRA_DIST =					\
+GENERIC_MACROS =				\
 auxdir.m4					\
 cond.m4						\
 depend.m4					\
 init.m4						\
 install-sh.m4					\
-m4.m4						\
 lispdir.m4					\
 missing.m4					\
 sanity.m4					\
 strip.m4
+
+SPECIFIC_MACROS =				\
+m4.m4
+
+EXTRA_DIST = $(GENERIC_MACROS) $(SPECIFIC_MACROS)
+MAINTAINERCLEANFILES = $(GENERIC_MACROS)
diff --git a/m4/Makefile.in b/m4/Makefile.in
index d16512f68..3858a0494 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -63,18 +63,24 @@ PACKAGE_NAME = @PACKAGE_NAME@
 PERL = @PERL@
 VERSION = @VERSION@
 
-EXTRA_DIST = \
+GENERIC_MACROS = \
 auxdir.m4					\
 cond.m4						\
 depend.m4					\
 init.m4						\
 install-sh.m4					\
-m4.m4						\
 lispdir.m4					\
 missing.m4					\
 sanity.m4					\
 strip.m4
 
+
+SPECIFIC_MACROS = \
+m4.m4
+
+
+EXTRA_DIST = $(GENERIC_MACROS) $(SPECIFIC_MACROS)
+MAINTAINERCLEANFILES = $(GENERIC_MACROS)
 subdir = m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES =
@@ -145,6 +151,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
diff --git a/man/Makefile.am b/man/Makefile.am
index 62280d9d7..5dc6c91ea 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -25,7 +25,7 @@ man_aux = autoconf.x autoreconf.x autoheader.x autoupdate.x ifnames.x \
 autoscan.x autom4te.x config.guess.x config.sub.x
 
 EXTRA_DIST = $(man_aux) common.x
-MAINTAINERCLEANFILES = $(man_MANS)
+MAINTAINERCLEANFILES = $(dist_man_MANS)
 
 # Depend on configure.ac to get version number changes.
 common_dep = $(top_srcdir)/configure.ac $(srcdir)/common.x
diff --git a/man/Makefile.in b/man/Makefile.in
index 10ba412de..bd8fbc251 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -72,7 +72,7 @@ autoscan.x autom4te.x config.guess.x config.sub.x
 
 
 EXTRA_DIST = $(man_aux) common.x
-MAINTAINERCLEANFILES = $(man_MANS)
+MAINTAINERCLEANFILES = $(dist_man_MANS)
 
 # Depend on configure.ac to get version number changes.
 common_dep = $(top_srcdir)/configure.ac $(srcdir)/common.x