From: Alexandre Duret-Lutz Date: Tue, 25 Nov 2003 22:07:12 +0000 (+0000) Subject: * doc/automake.texi (Program variables): Mention per-target X-Git-Tag: Release-1-7f~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=543554ae4dfcbc520f94b634a5b06298d1006930;p=thirdparty%2Fautomake.git * doc/automake.texi (Program variables): Mention per-target _CPPFLAGS in the documentation of INCLUDES. * automake.in (generate_makefile): Likewise in the INCLUDES diagnostic. Report from Bob Friesenhahn. --- diff --git a/ChangeLog b/ChangeLog index e9f30fd34..2768da609 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2003-11-25 Alexandre Duret-Lutz + * doc/automake.texi (Program variables): Mention per-target + _CPPFLAGS in the documentation of INCLUDES. + * automake.in (generate_makefile): Likewise in the INCLUDES diagnostic. + Report from Bob Friesenhahn. + * doc/automake.texi (Extending): Elaborate on overriding. * NEWS: Likewise. Suggested by Bruno Haible. diff --git a/THANKS b/THANKS index 72743bafa..b591703a9 100644 --- a/THANKS +++ b/THANKS @@ -29,6 +29,7 @@ Bernd Jendrissek berndfoobar@users.sourceforge.net Bill Currie bcurrie@tssc.co.nz Bill Davidson bill@kayhay.com Bill Fenner fenner@parc.xerox.com +Bob Friesenhahn bfriesen@simple.dallas.tx.us Bob Proulx rwp@hprwp.fc.hp.com Braden N. McDaniel braden@endoframe.com Brendan O'Dea bod@compusol.com.au diff --git a/automake.in b/automake.in index 1ee5db42d..ee8d35e00 100755 --- a/automake.in +++ b/automake.in @@ -6745,7 +6745,7 @@ sub generate_makefile ($$) # Catch some obsolete variables. msg_var ('obsolete', 'INCLUDES', - "`INCLUDES' is the old name for `AM_CPPFLAGS'") + "`INCLUDES' is the old name for `AM_CPPFLAGS' (or `*_CPPFLAGS')") if var ('INCLUDES'); # At the toplevel directory, we might need config.guess, config.sub diff --git a/doc/automake.texi b/doc/automake.texi index e8b0ba2cf..c78075c9a 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -3236,9 +3236,10 @@ the default @samp{-I} options using the @samp{nostdinc} option. per-library) @code{_CPPFLAGS} variable if it is defined. @item INCLUDES -This does the same job as @samp{AM_CPPFLAGS}. It is an older name for -the same functionality. This variable is deprecated; we suggest using -@samp{AM_CPPFLAGS} instead. +This does the same job as @samp{AM_CPPFLAGS} (or any per-target +@samp{_CPPFLAGS} variable if it is used). It is an older name for the +same functionality. This variable is deprecated; we suggest using +@samp{AM_CPPFLAGS} and per-target @samp{_CPPFLAGS} instead. @item AM_CFLAGS This is the variable which the @file{Makefile.am} author can use to pass