From bd35528e89f1bc31f74a8998f7dde71652424e63 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 9 Apr 2001 10:02:39 +0000 Subject: [PATCH] * remake.am: Merge into... * configure.am: ... here. * automake.in (&handle_configure): Adjust. --- ChangeLog | 6 ++++++ Makefile.am | 4 ++-- Makefile.in | 4 ++-- automake.in | 1 - configure.am | 19 +++++++++++++++++++ lib/am/Makefile.am | 4 ++-- lib/am/configure.am | 19 +++++++++++++++++++ remake.am | 24 ------------------------ 8 files changed, 50 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 765523a2..be56e929 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-04-09 Akim Demaille + + * remake.am: Merge into... + * configure.am: ... here. + * automake.in (&handle_configure): Adjust. + 2001-04-09 Akim Demaille * automake.in (&output_lex_build_rule): Output this... diff --git a/Makefile.am b/Makefile.am index 6a244e76..4385370c 100644 --- 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 c92d216c..258d4a9c 100644 --- 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 0454bdeb..ec9cdd9f 100755 --- 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 fd83b4aa..348b1e4d 100644 --- 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 6a244e76..4385370c 100644 --- 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 fd83b4aa..348b1e4d 100644 --- 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 30a9680c..e69de29b 100644 --- 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) -- 2.43.5