From: Tom Tromey Date: Wed, 19 Mar 1997 00:21:30 +0000 (+0000) Subject: fixlets X-Git-Tag: Release-1-1m~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=220aadb980df290488ec846fb5c9e2b96e19153c;p=thirdparty%2Fautomake.git fixlets --- diff --git a/ChangeLog b/ChangeLog index 96821c6be..c2b058881 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 18 17:20:03 1997 Tom Tromey + + * automake.in (target_defined): New sub. + (handle_footer): Error if target .SUFFIXES used. + Sun Mar 16 14:33:41 1997 Tom Tromey * automake.in (handle_lib_objects): Set seen_c_source to line diff --git a/TODO b/TODO index d71b5e16f..2263af71e 100644 --- a/TODO +++ b/TODO @@ -16,6 +16,9 @@ non-C source in a libtool library specification. - if the target is mandated (eg, "info"), tell the user consider auto-modifying the program name to work around this +* if it isn't possible do use .SUFFIXES as a target, then give error + if it appears in Makefile.am + ================================================================ should clean up texinfos.am; one rule is repeated 3 times, but diff --git a/aclocal.in b/aclocal.in index 15ffbd66b..ed6b4498e 100644 --- a/aclocal.in +++ b/aclocal.in @@ -159,11 +159,9 @@ sub parse_arguments elsif ($arglist[0] eq '--version') { print "aclocal (GNU $PACKAGE) $VERSION\n"; - print "Copyright (C) 1996 Free Software Foundation, Inc.\n"; - print "aclocal comes with ABSOLUTELY NO WARRANTY.\n"; - print "You may redistribute copies of aclocal\n"; - print "under the terms of the GNU General Public License.\n"; - print "For more information about these matters, see the file named COPYING.\n"; + print "Copyright (C) 1996, 1997 Free Software Foundation, Inc.\n"; + print "This is free software; see the source for copying conditions. There is NO\n"; + print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; exit 0; } elsif ($arglist[0] eq '--help') diff --git a/automake.in b/automake.in index 39d3f165d..3220f5d74 100755 --- a/automake.in +++ b/automake.in @@ -269,11 +269,10 @@ sub parse_arguments if ($arglist[0] eq "--version") { print "automake (GNU $PACKAGE) $VERSION\n"; - print "Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.\n"; - print "automake comes with ABSOLUTELY NO WARRANTY.\n"; - print "You may redistribute copies of automake\n"; - print "under the terms of the GNU General Public License.\n"; - print "For more information about these matters, see the file named COPYING.\n"; + print "Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.\n"; + print "This is free software; see the source for copying conditions. There is NO\n"; + print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; + exit 0; } elsif ($arglist[0] eq "--help") @@ -2759,6 +2758,11 @@ sub handle_footer # line. push (@suffixes, &variable_value_as_list ('SUFFIXES')); } + if (&target_defined ('.SUFFIXES')) + { + &am_line_error ('.SUFFIXES', + "use variable \`SUFFIXES', not target \`.SUFFIXES'"); + } # Note: AIX 4.1 /bin/make will fail if any suffix rule appears # before .SUFFIXES. So we make sure that .SUFFIXES appears before @@ -3752,6 +3756,13 @@ sub pretty_print_rule ################################################################ +# See if a target exists. +sub target_defined +{ + local ($target) = @_; + return defined $targets{$target}; +} + # See if a variable exists. sub variable_defined { diff --git a/automake.texi b/automake.texi index 60343be41..dc8901e36 100644 --- a/automake.texi +++ b/automake.texi @@ -218,7 +218,7 @@ information. @item --gnu Set the global strictness to @samp{gnu}. @xref{Gnits} for more -information. +information. This is the default strictness. @item --help Print a summary of the command line options and exit. @@ -1183,11 +1183,13 @@ The command used to actually link a C++ program. @node ANSI @section Automatic de-ANSI-fication -Although the GNU standards prohibit it, some GNU programs are written in -ANSI C. This is possible because each source file can be -``de-ANSI-fied'' before the actual compilation takes place. -@c NOTE that the standards no longer prohibit this! -@c What does that imply for this feature? +Although the GNU standards allow the use of ANSI C, this can have the +effect of limiting portability of a package to some older compilers +(notably SunOS). + +Automake allows you to work around this problem on such machines by +``de-ANSI-fying'' each source file before the actual compilation takes +place. If the @file{Makefile.am} variable @code{AUTOMAKE_OPTIONS} @vindex AUTOMAKE_OPTIONS @@ -1231,7 +1233,6 @@ Note that the directory holding the @code{ansi2knr} support files must be built before all other directories using these files. Automake does not currently check that this is the case. - @node Dependencies @section Automatic dependency tracking diff --git a/stamp-vti b/stamp-vti index ff4cd25ee..a557ee8b3 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,3 +1,3 @@ -@set UPDATED 28 February 1997 +@set UPDATED 18 March 1997 @set EDITION 1.1m @set VERSION 1.1m diff --git a/version.texi b/version.texi index ff4cd25ee..a557ee8b3 100644 --- a/version.texi +++ b/version.texi @@ -1,3 +1,3 @@ -@set UPDATED 28 February 1997 +@set UPDATED 18 March 1997 @set EDITION 1.1m @set VERSION 1.1m