56-de-com-vars.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * comp-vars.am: Remove, merged into...
        * compile.am: here.
        * automake.in (&get_object_extension): Adjust.

Index: Makefile.am
--- Makefile.am Sun, 11 Mar 2001 20:39:39 +0100 akim (am/f/46_Makefile.a 1.19 
644)
+++ Makefile.am Sun, 11 Mar 2001 21:00:04 +0100 akim (am/f/46_Makefile.a 1.19 
644)
@@ -10,13 +10,13 @@
 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)
Index: Makefile.in
--- Makefile.in Sun, 11 Mar 2001 20:56:42 +0100 akim (am/h/16_Makefile.i 1.49 
644)
+++ Makefile.in Sun, 11 Mar 2001 21:02:07 +0100 akim (am/h/16_Makefile.i 1.49 
644)
@@ -84,13 +84,13 @@
 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 \
Index: automake.in
--- automake.in Sun, 11 Mar 2001 20:56:42 +0100 akim (am/f/39_automake.i 1.175 
755)
+++ automake.in Sun, 11 Mar 2001 21:01:52 +0100 akim (am/f/39_automake.i 1.175 
755)
@@ -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,
Index: compile.am
--- compile.am Sun, 04 Mar 2001 20:02:14 +0100 akim (am/g/48_compile.am 1.4 644)
+++ compile.am Sun, 11 Mar 2001 20:58:11 +0100 akim (am/g/48_compile.am 1.4 644)
@@ -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 = @address@hidden
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+
+
 mostlyclean-am: mostlyclean-compile
 mostlyclean-compile:
 ## Don't remove 'core.*' because some distributions have eg "core.c".
Index: comp-vars.am
--- comp-vars.am Mon, 26 Feb 2001 23:44:40 +0100 akim (am/g/49_comp-vars. 1.2 
644)
+++ comp-vars.am Sun, 11 Mar 2001 21:03:04 +0100 akim ()
@@ -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 = @address@hidden
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@