From e13f3ed4eb0a660553e7f5c99bacbc607f150865 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 14 Dec 1999 04:10:36 +0000 Subject: [PATCH] * depend2.am: Removed erroneous comment. * automake.texi (Program variables): Document nostdinc. (Options): Likewise. * automake.in (get_object_extension): Respect nostdinc option. (handle_options): Recognize nostdinc. * comp-vars.am (DEFS): Use @DEFAULT_INCLUDES@ as sole substitution. * automake.in (read_am_file): Allow conditional includes. Fixes test condincl.test. --- ChangeLog | 12 +++++++++ TODO | 77 +++++++++++++++++++++++++++-------------------------- automake.in | 43 +++++++++++++++++++++--------- automake.texi | 12 ++++++--- comp-vars.am | 4 +-- depend2.am | 4 --- lib/am/comp-vars.am | 4 +-- lib/am/depend2.am | 4 --- stamp-vti | 2 +- version.texi | 2 +- 10 files changed, 97 insertions(+), 67 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14b5e71..6b2ac0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 1999-12-13 Tom Tromey + * depend2.am: Removed erroneous comment. + + * automake.texi (Program variables): Document nostdinc. + (Options): Likewise. + * automake.in (get_object_extension): Respect nostdinc option. + (handle_options): Recognize nostdinc. + * comp-vars.am (DEFS): Use @DEFAULT_INCLUDES@ as sole + substitution. + + * automake.in (read_am_file): Allow conditional includes. Fixes + test condincl.test. + * depcomp: Handle case on SGI when libtool is `yes'. * depend2.am (@EXT@.o): Set libtool. (@EXT@.lo): Likewise. diff --git a/TODO b/TODO index dd748d7..6ea6757 100644 --- a/TODO +++ b/TODO @@ -1,14 +1,39 @@ +* in depend2.am, in specialization case, what if @SOURCE@ is found + in srcdir? We can't depend on $) { if (/$IGNORE_PATTERN/o) @@ -6371,8 +6380,18 @@ sub read_am_file $output_trailer .= $comment; - &am_error ("unterminated conditionals: " . join (' ', @conditional_stack)) - if (@conditional_stack); + if (join (' ', @saved_cond_stack) ne join (' ', @conditional_stack)) + { + if (@conditional_stack) + { + &am_error ("unterminated conditionals: " . join (' ', @conditional_stack)); + } + else + { + # FIXME: better error message here. + &am_error ("conditionals not nested in include file"); + } + } } # A helper for read_main_am_file which initializes configure variables diff --git a/automake.texi b/automake.texi index a3ddd12..708b189 100644 --- a/automake.texi +++ b/automake.texi @@ -1802,9 +1802,10 @@ There are some additional variables which Automake itself defines: A list of @samp{-I} options. This can be set in your @file{Makefile.am} if you have special directories you want to look in. Automake already provides some @samp{-I} options automatically. In particular it -generates @samp{-I$(srcdir)} and a @samp{-I} pointing to the directory -holding @file{config.h} (if you've used @code{AC_CONFIG_HEADER} or -@code{AM_CONFIG_HEADER}). +generates @samp{-I$(srcdir)}, @samp{-I.}, and a @samp{-I} pointing to +the directory holding @file{config.h} (if you've used +@code{AC_CONFIG_HEADER} or @code{AM_CONFIG_HEADER}). You can disable +the default @samp{-I} options using the @samp{nostdinc} option. @code{INCLUDES} can actually be used for other @code{cpp} options besides @samp{-I}. For instance, it is sometimes used to pass arbitrary @@ -3181,6 +3182,11 @@ be available for optional installation. This option is disallowed at @samp{GNU} strictness and above. @trindex install-man +@item @code{nostdinc} +@cindex Option, nostdinc +This option can be used to disable the standard @samp{-I} options which +are ordinarily automatically provided by Automake. + @item @code{no-texinfo.tex} @cindex Option, no-texinfo Don't require @file{texinfo.tex}, even if there are texinfo files in diff --git a/comp-vars.am b/comp-vars.am index c7d773b..e38d326 100644 --- a/comp-vars.am +++ b/comp-vars.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1998, 1999 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 @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -DEFS = @DEFS@ -I. -I$(srcdir) @CONFIG_INCLUDE_SPEC@ +DEFS = @DEFS@@DEFAULT_INCLUDES@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/depend2.am b/depend2.am index 97a8b45..f73ddb5 100644 --- a/depend2.am +++ b/depend2.am @@ -15,10 +15,6 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -## Note that this must all be on one line to avoid a problem with -## automake's `.am' file reader. This is a convenience macro a user -## can use to run a compilation. You should set the shell variables -## `file' and `compile' first. @AMDEP@@FPFX@DEPMODE = @@FPFX@DEPMODE@ @EXT@.o: diff --git a/lib/am/comp-vars.am b/lib/am/comp-vars.am index c7d773b..e38d326 100644 --- a/lib/am/comp-vars.am +++ b/lib/am/comp-vars.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1998, 1999 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 @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -DEFS = @DEFS@ -I. -I$(srcdir) @CONFIG_INCLUDE_SPEC@ +DEFS = @DEFS@@DEFAULT_INCLUDES@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/lib/am/depend2.am b/lib/am/depend2.am index 97a8b45..f73ddb5 100644 --- a/lib/am/depend2.am +++ b/lib/am/depend2.am @@ -15,10 +15,6 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -## Note that this must all be on one line to avoid a problem with -## automake's `.am' file reader. This is a convenience macro a user -## can use to run a compilation. You should set the shell variables -## `file' and `compile' first. @AMDEP@@FPFX@DEPMODE = @@FPFX@DEPMODE@ @EXT@.o: diff --git a/stamp-vti b/stamp-vti index 950da01..98eea97 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,3 +1,3 @@ -@set UPDATED 21 November 1999 +@set UPDATED 13 December 1999 @set EDITION 1.4a @set VERSION 1.4a diff --git a/version.texi b/version.texi index 950da01..98eea97 100644 --- a/version.texi +++ b/version.texi @@ -1,3 +1,3 @@ -@set UPDATED 21 November 1999 +@set UPDATED 13 December 1999 @set EDITION 1.4a @set VERSION 1.4a -- 2.7.4