diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-27 20:27:24 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-29 12:48:25 +0200 |
| commit | 269236a4212bfeb491ced6c6f0ae5d8fa42b734c (patch) | |
| tree | 6b5317723234e05626948903fa878a23c9c2d5ef /t/no-extra-makefile-code.sh | |
| parent | 8b740587e3f076c6338523b2bbb130e72f5dfef0 (diff) | |
| download | automake-269236a4212bfeb491ced6c6f0ae5d8fa42b734c.tar.gz | |
[ng] compile: add extra -I opts from config headers at make runtime
Unless the 'no-stdinc' option is in use, automake automatically adds
to the compiler's include path (through the use of '-I' options placed
in the $(DEFAULT_INCLUDES) variable) the $(srcdir), the current
directory, and all the directories where header files specified with
AC_CONFIG_HEADERS macro are placed. It also tries to remove unseemly
duplicated '-I' entries, for example simplifying "-I. -I$(srcdir)" to
"-I." when in a non-VPATH build (in which case '$(srcdir)' is simply
'.').
Before this change, that preprocessing was done both at automake runtime
and configure runtime; with GNU make features, we can simplify it a bit
and move almost all of it at make runtime instead.
* automake.in (handle_compile): Remove automake-time preprocessing, and
support for further configure-time preprocessing, of the intended contents
of $(DEFAULT_INCLUDES); instead, move all of them ...
* lib/am/compile.am (DEFAULT_INCLUDES) [%?STDINC%]: ... here.
* m4/init.m4: Remove AC_SUBST of @am__isrc@.
* t/no-extra-makefile-code.sh: Trivially adjust.
* t/nostdinc.sh: Adjust by preferring more "semantic" checks to grepping
checks.
* t/confh4.sh: Adjust and extend.
* t/stdinc-no-repeated.sh: New test.
* Makefile.am (do_subst): Remove a now-unneeded hack.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/no-extra-makefile-code.sh')
| -rwxr-xr-x | t/no-extra-makefile-code.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/no-extra-makefile-code.sh b/t/no-extra-makefile-code.sh index 1742dc433..f0246b769 100755 --- a/t/no-extra-makefile-code.sh +++ b/t/no-extra-makefile-code.sh @@ -30,7 +30,7 @@ rm -f depcomp compile $ACLOCAL $AUTOMAKE -$EGREP 'DEFAULT_INCLUDES|@am__isrc@|-compile|\$\(OBJEXT\)|tab\.[ch]' \ - Makefile.in && Exit 1 +$EGREP 'DEFAULT_INCLUDES|-compile|\$\(OBJEXT\)|tab\.[ch]' Makefile.in \ + && Exit 1 : |