54-de-remake-am.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * remake.am: Merge into...
        * configure.am: ... here.
        * automake.in (&handle_configure): Adjust.

Index: Makefile.am
--- Makefile.am Sun, 11 Mar 2001 20:30:44 +0100 akim (am/f/46_Makefile.a 1.18 
644)
+++ Makefile.am Sun, 11 Mar 2001 20:37:34 +0100 akim (am/f/46_Makefile.a 1.18 
644)
@@ -15,8 +15,8 @@
 distdir.am footer.am header-vars.am header.am install.am java.am \
 kr-extra.am lex.am library.am libs.am libtool.am lisp.am ltlib.am \
 ltlibrary.am mans-vars.am mans.am multilib.am program.am progs.am \
-python.am remake-hdr.am remake.am scripts.am subdirs.am tags.am \
-texi-vers.am texibuild.am texinfos.am yacc.am
+python.am remake-hdr.am scripts.am subdirs.am tags.am texi-vers.am \
+texibuild.am texinfos.am yacc.am

 dist_pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 \
 $(amfiles)
Index: Makefile.in
--- Makefile.in Sun, 11 Mar 2001 20:30:44 +0100 akim (am/h/16_Makefile.i 1.47 
644)
+++ Makefile.in Sun, 11 Mar 2001 20:37:53 +0100 akim (am/h/16_Makefile.i 1.47 
644)
@@ -89,8 +89,8 @@
 distdir.am footer.am header-vars.am header.am install.am java.am \
 kr-extra.am lex.am library.am libs.am libtool.am lisp.am ltlib.am \
 ltlibrary.am mans-vars.am mans.am multilib.am program.am progs.am \
-python.am remake-hdr.am remake.am scripts.am subdirs.am tags.am \
-texi-vers.am texibuild.am texinfos.am yacc.am
+python.am remake-hdr.am scripts.am subdirs.am tags.am texi-vers.am \
+texibuild.am texinfos.am yacc.am


 dist_pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 \
@@ -151,13 +151,13 @@
        cd $(top_builddir) && \
          CONFIG_HEADERS= CONFIG_LINKS= \
          CONFIG_FILES=$@ $(SHELL) ./config.status
-$(ACLOCAL_M4): configure.in
-       cd $(srcdir) && $(ACLOCAL)

 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        $(SHELL) ./config.status --recheck
 $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) 
$(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): configure.in
+       cd $(srcdir) && $(ACLOCAL)
 automake: $(top_builddir)/config.status automake.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= 
$(SHELL) ./config.status
 aclocal: $(top_builddir)/config.status aclocal.in
Index: automake.in
--- automake.in Sun, 11 Mar 2001 20:30:44 +0100 akim (am/f/39_automake.i 1.173 
755)
+++ automake.in Sun, 11 Mar 2001 20:37:21 +0100 akim (am/f/39_automake.i 1.173 
755)
@@ -3405,7 +3405,6 @@ sub handle_configure
     if ($relative_dir eq '.')
     {
        &handle_aclocal_m4;
-       $output_rules .= &file_contents ('remake');
        &examine_variable ('CONFIG_STATUS_DEPENDENCIES');
        &examine_variable ('CONFIGURE_DEPENDENCIES');

Index: configure.am
--- configure.am Mon, 05 Mar 2001 22:33:22 +0100 akim (am/h/32_configure. 1.4 
644)
+++ configure.am Sun, 11 Mar 2001 20:35:04 +0100 akim (am/h/32_configure. 1.4 
644)
@@ -17,6 +17,10 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.

+## --------------------- ##
+## Building Makefile.*.  ##
+## --------------------- ##
+
 ## This rule remakes the Makefile.in.
 %MAKEFILE-IN%: %MAINTAINER-MODE% %MAKEFILE-AM% %MAKEFILE-IN-DEPS% 
$(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4)
        cd $(top_srcdir) && \
@@ -27,3 +31,18 @@
        cd $(top_builddir) && \
          CONFIG_HEADERS= CONFIG_LINKS= \
          CONFIG_FILES=%CONFIG-MAKEFILE% $(SHELL) ./config.status
+
+
+
+## ----------------------- ##
+## Bulding config.status.  ##
+## ----------------------- ##
+
+if %?TOPDIR_P%
+## Explicitly look in srcdir for benefit of non-GNU makes.
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       $(SHELL) ./config.status --recheck
+## Explicitly look in srcdir for benefit of non-GNU makes.
+$(srcdir)/configure: %MAINTAINER-MODE% $(srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4) 
$(CONFIGURE_DEPENDENCIES)
+       cd $(srcdir) && $(AUTOCONF)
+endif %?TOPDIR_P%
Index: remake.am
--- remake.am Sun, 04 Mar 2001 11:28:37 +0100 akim (am/g/16_remake.am 1.5 644)
+++ remake.am Sun, 11 Mar 2001 20:39:28 +0100 akim ()
@@ -1,24 +0,0 @@
-## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996, 1997, 1998, 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.
-
-## Explicitly look in srcdir for benefit of non-GNU makes.
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       $(SHELL) ./config.status --recheck
-## Explicitly look in srcdir for benefit of non-GNU makes.
-$(srcdir)/configure: %MAINTAINER-MODE% $(srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4) 
$(CONFIGURE_DEPENDENCIES)
-       cd $(srcdir) && $(AUTOCONF)