diff options
author | Russell King <rmk+lkml@arm.linux.org.uk> | 2005-10-30 16:42:11 -0500 |
---|---|---|
committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2005-11-06 04:22:04 -0500 |
commit | 2dd34b488a99135ad2a529e33087ddd6a09e992a (patch) | |
tree | 785b06eabfea3fdebf571b1e2b8a1ea695974416 | |
parent | f912696ab330bf539231d1f8032320f2a08b850f (diff) |
[PATCH] kbuild: permanently fix kernel configuration include mess
Include autoconf.h into every kernel compilation via the gcc command line
using -imacros. This ensures that we have the kernel configuration
included from the start, rather than relying on each file having #include
<linux/config.h> as appropriate. History has shown that this is something
which is difficult to get right.
Since we now include the kernel configuration automatically, make
configcheck becomes meaningless, so remove it.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | include/linux/config.h | 4 |
2 files changed, 5 insertions, 7 deletions
@@ -346,7 +346,8 @@ AFLAGS_KERNEL = | |||
346 | # Use LINUXINCLUDE when you must reference the include/ directory. | 346 | # Use LINUXINCLUDE when you must reference the include/ directory. |
347 | # Needed to be compatible with the O= option | 347 | # Needed to be compatible with the O= option |
348 | LINUXINCLUDE := -Iinclude \ | 348 | LINUXINCLUDE := -Iinclude \ |
349 | $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) | 349 | $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \ |
350 | -imacros include/linux/autoconf.h | ||
350 | 351 | ||
351 | CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE) | 352 | CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE) |
352 | 353 | ||
@@ -1249,11 +1250,6 @@ tags: FORCE | |||
1249 | # Scripts to check various things for consistency | 1250 | # Scripts to check various things for consistency |
1250 | # --------------------------------------------------------------------------- | 1251 | # --------------------------------------------------------------------------- |
1251 | 1252 | ||
1252 | configcheck: | ||
1253 | find * $(RCS_FIND_IGNORE) \ | ||
1254 | -name '*.[hcS]' -type f -print | sort \ | ||
1255 | | xargs $(PERL) -w scripts/checkconfig.pl | ||
1256 | |||
1257 | includecheck: | 1253 | includecheck: |
1258 | find * $(RCS_FIND_IGNORE) \ | 1254 | find * $(RCS_FIND_IGNORE) \ |
1259 | -name '*.[hcS]' -type f -print | sort \ | 1255 | -name '*.[hcS]' -type f -print | sort \ |
diff --git a/include/linux/config.h b/include/linux/config.h index 9d1c14f7ad6d..a91f5e55b525 100644 --- a/include/linux/config.h +++ b/include/linux/config.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _LINUX_CONFIG_H | 1 | #ifndef _LINUX_CONFIG_H |
2 | #define _LINUX_CONFIG_H | 2 | #define _LINUX_CONFIG_H |
3 | 3 | /* This file is no longer in use and kept only for backward compatibility. | |
4 | * autoconf.h is now included via -imacros on the commandline | ||
5 | */ | ||
4 | #include <linux/autoconf.h> | 6 | #include <linux/autoconf.h> |
5 | 7 | ||
6 | #endif | 8 | #endif |