* remake.am: Merge into...

* configure.am: ... here.
* automake.in (&handle_configure): Adjust.

diff --git a/ChangeLog b/ChangeLog
index 765523a23cce46c9dfc44e7be785df4bc5bb5a40..be56e92928d71f38ab13e8613290adc9905374f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-09  Akim Demaille  <akim@epita.fr>
+
+       * remake.am: Merge into...
+       * configure.am: ... here.
+       * automake.in (&handle_configure): Adjust.
+
 2001-04-09  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&output_lex_build_rule): Output this...

diff --git a/Makefile.am b/Makefile.am
index 6a244e765a9cedb1f3935646fc9f1da01abbcdf6..4385370c84f5df25a514f4ef313d3260643e1cd6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,8 +15,8 @@ compile.am configure.am data.am dejagnu.am depend.am depend2.am \
 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)

diff --git a/Makefile.in b/Makefile.in
index c92d216cd45b2760d6b46abc51ba20c572574d73..258d4a9c21b203c54769f6d52de97e658c626861 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -88,8 +88,8 @@ compile.am configure.am data.am dejagnu.am depend.am depend2.am \
 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 \

diff --git a/automake.in b/automake.in
index 0454bdeb3ef81fbd89107cf2cd98769ba0967a94..ec9cdd9feec34692ddfc69006e8d91a04d665238 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -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');
 

diff --git a/configure.am b/configure.am
index fd83b4aaca855278c0e5b5aa18bcee022cf63e51..348b1e4def476df96d394a501a9f75e456e6e65d 100644 (file)
--- a/configure.am
+++ b/configure.am
@@ -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%

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 6a244e765a9cedb1f3935646fc9f1da01abbcdf6..4385370c84f5df25a514f4ef313d3260643e1cd6 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -15,8 +15,8 @@ compile.am configure.am data.am dejagnu.am depend.am depend2.am \
 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)

diff --git a/lib/am/configure.am b/lib/am/configure.am
index fd83b4aaca855278c0e5b5aa18bcee022cf63e51..348b1e4def476df96d394a501a9f75e456e6e65d 100644 (file)
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -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%

diff --git a/remake.am b/remake.am
index 30a9680c248a7eb08907b23b50c5a9f60024c6a0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/remake.am
+++ b/remake.am
@@ -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)