>>> "Bob" == Bob Friesenhahn <[EMAIL PROTECTED]> writes:
Bob> The Automake documentation claims that 'INCLUDES' is the
Bob> equivalent of 'AM_CPPFLAGS'. However, I find that this is
Bob> not the case at all. If AM_CPPFLAGS is used, then any
Bob> per-target CPPFLAGS option completely overrides it.
Thanks for pointing this out. I'm checking this in.
2003-11-25 Alexandre Duret-Lutz <[EMAIL PROTECTED]>
* 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.
Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.229
diff -u -r1.229 THANKS
--- THANKS 24 Nov 2003 07:39:09 -0000 1.229
+++ THANKS 25 Nov 2003 22:03:41 -0000
@@ -29,6 +29,7 @@
Bill Currie [EMAIL PROTECTED]
Bill Davidson [EMAIL PROTECTED]
Bill Fenner [EMAIL PROTECTED]
+Bob Friesenhahn [EMAIL PROTECTED]
Bob Proulx [EMAIL PROTECTED]
Braden N. McDaniel [EMAIL PROTECTED]
Brendan O'Dea [EMAIL PROTECTED]
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1518
diff -u -r1.1518 automake.in
--- automake.in 22 Nov 2003 18:05:34 -0000 1.1518
+++ automake.in 25 Nov 2003 22:03:47 -0000
@@ -6745,7 +6745,7 @@
# 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
Index: doc/automake.texi
===================================================================
RCS file: /cvs/automake/automake/doc/automake.texi,v
retrieving revision 1.10
diff -u -r1.10 automake.texi
--- doc/automake.texi 25 Nov 2003 21:48:24 -0000 1.10
+++ doc/automake.texi 25 Nov 2003 22:03:54 -0000
@@ -3236,9 +3236,10 @@
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
[EMAIL PROTECTED] instead.
+This does the same job as @samp{AM_CPPFLAGS} (or any per-target
[EMAIL PROTECTED] variable if it is used). It is an older name for the
+same functionality. This variable is deprecated; we suggest using
[EMAIL PROTECTED] and per-target @samp{_CPPFLAGS} instead.
@item AM_CFLAGS
This is the variable which the @file{Makefile.am} author can use to pass
--
Alexandre Duret-Lutz
