* comp-vars.am: Remove, merged into...

* compile.am: here.
* automake.in (&get_object_extension): Adjust.

diff --git a/ChangeLog b/ChangeLog
index be56e92928d71f38ab13e8613290adc9905374f0..b17dfc5e855c1c39ac79c454f078beae3a814612 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-09  Akim Demaille  <akim@epita.fr>
+
+       * comp-vars.am: Remove, merged into...
+       * compile.am: here.
+       * automake.in (&get_object_extension): Adjust.
+
 2001-04-09  Akim Demaille  <akim@epita.fr>
 
        * remake.am: Merge into...

diff --git a/Makefile.am b/Makefile.am
index 4385370c84f5df25a514f4ef313d3260643e1cd6..162e8e4d06d2d55f483fb6ff79e2aea23fd04f2a 100644 (file)
--- 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 258d4a9c21b203c54769f6d52de97e658c626861..cf15ecd5fd573b77236b8f173a0b942b17d0ae55 100644 (file)
--- 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 ec9cdd9feec34692ddfc69006e8d91a04d665238..89a3fcb98c91d57658e901d63bc65670fa2f584f 100755 (executable)
--- 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 6d346340a4283c2ef2c9d91a3eeacabbdec3dbcd..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 75f7c0ee9d52b08b1e24abc90ec1112b709c556d..f47c2e0cbb056d347f1690de5f7c8a608148a77f 100644 (file)
--- 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 4385370c84f5df25a514f4ef313d3260643e1cd6..162e8e4d06d2d55f483fb6ff79e2aea23fd04f2a 100644 (file)
--- 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 6d346340a4283c2ef2c9d91a3eeacabbdec3dbcd..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 75f7c0ee9d52b08b1e24abc90ec1112b709c556d..f47c2e0cbb056d347f1690de5f7c8a608148a77f 100644 (file)
--- 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".