From 786e5437af6f4a2b98a17eea2e185d95f970d01b Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 9 Apr 2001 10:06:37 +0000 Subject: [PATCH] * comp-vars.am: Remove, merged into... * compile.am: here. * automake.in (&get_object_extension): Adjust. --- ChangeLog | 6 ++++++ Makefile.am | 14 +++++++------- Makefile.in | 14 +++++++------- automake.in | 9 +++++---- comp-vars.am | 22 ---------------------- compile.am | 7 +++++++ lib/am/Makefile.am | 14 +++++++------- lib/am/comp-vars.am | 22 ---------------------- lib/am/compile.am | 7 +++++++ 9 files changed, 46 insertions(+), 69 deletions(-) diff --git a/ChangeLog b/ChangeLog index be56e929..b17dfc5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-04-09 Akim Demaille + + * comp-vars.am: Remove, merged into... + * compile.am: here. + * automake.in (&get_object_extension): Adjust. + 2001-04-09 Akim Demaille * remake.am: Merge into... diff --git a/Makefile.am b/Makefile.am index 4385370c..162e8e4d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,13 +10,13 @@ SUBDIRS = . m4 tests bin_SCRIPTS = automake aclocal info_TEXINFOS = automake.texi -amfiles = check.am clean-hdr.am clean-kr.am clean.am comp-vars.am \ -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 scripts.am subdirs.am tags.am texi-vers.am \ -texibuild.am texinfos.am yacc.am +amfiles = check.am clean-hdr.am clean-kr.am clean.am 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 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 258d4a9c..cf15ecd5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -83,13 +83,13 @@ SUBDIRS = . m4 tests bin_SCRIPTS = automake aclocal info_TEXINFOS = automake.texi -amfiles = check.am clean-hdr.am clean-kr.am clean.am comp-vars.am \ -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 scripts.am subdirs.am tags.am texi-vers.am \ -texibuild.am texinfos.am yacc.am +amfiles = check.am clean-hdr.am clean-kr.am clean.am 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 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 ec9cdd9f..89a3fcb9 100755 --- a/automake.in +++ b/automake.in @@ -1273,11 +1273,12 @@ sub get_object_extension } } } - $output_vars .= &file_contents ('comp-vars', - ('DEFAULT_INCLUDES' - => $default_includes)); - $output_rules .= &file_contents ('compile'); + my ($coms, $vars, $rules) = + &file_contents_internal ('compile', + ('DEFAULT_INCLUDES' => $default_includes)); + $output_vars .= $vars; + $output_rules .= "$coms$rules"; # If using X, include some extra variable definitions. NOTE # we don't want to force these into CFLAGS or anything, diff --git a/comp-vars.am b/comp-vars.am index 6d346340..e69de29b 100644 --- a/comp-vars.am +++ b/comp-vars.am @@ -1,22 +0,0 @@ -## automake - create Makefile.in from Makefile.am -## Copyright 1994, 1995, 1996, 1998, 1999, 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. - -DEFS = @DEFS@%DEFAULT_INCLUDES% -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ diff --git a/compile.am b/compile.am index 75f7c0ee..f47c2e0c 100644 --- a/compile.am +++ b/compile.am @@ -16,6 +16,13 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. + +DEFS = @DEFS@%DEFAULT_INCLUDES% +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ + + mostlyclean-am: mostlyclean-compile mostlyclean-compile: ## Don't remove 'core.*' because some distributions have eg "core.c". diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am index 4385370c..162e8e4d 100644 --- a/lib/am/Makefile.am +++ b/lib/am/Makefile.am @@ -10,13 +10,13 @@ SUBDIRS = . m4 tests bin_SCRIPTS = automake aclocal info_TEXINFOS = automake.texi -amfiles = check.am clean-hdr.am clean-kr.am clean.am comp-vars.am \ -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 scripts.am subdirs.am tags.am texi-vers.am \ -texibuild.am texinfos.am yacc.am +amfiles = check.am clean-hdr.am clean-kr.am clean.am 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 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/comp-vars.am b/lib/am/comp-vars.am index 6d346340..e69de29b 100644 --- a/lib/am/comp-vars.am +++ b/lib/am/comp-vars.am @@ -1,22 +0,0 @@ -## automake - create Makefile.in from Makefile.am -## Copyright 1994, 1995, 1996, 1998, 1999, 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. - -DEFS = @DEFS@%DEFAULT_INCLUDES% -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ diff --git a/lib/am/compile.am b/lib/am/compile.am index 75f7c0ee..f47c2e0c 100644 --- a/lib/am/compile.am +++ b/lib/am/compile.am @@ -16,6 +16,13 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. + +DEFS = @DEFS@%DEFAULT_INCLUDES% +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ + + mostlyclean-am: mostlyclean-compile mostlyclean-compile: ## Don't remove 'core.*' because some distributions have eg "core.c". -- 2.43.5