kbuild: move autoconf.h to include/generated

Sam Ravnborg committed 17 years ago

Commit 264a2681 parent 98b87887 files · +16 −15Browse files

Showing the changes to scripts (3 of 7 files). Show all

Unified · Split

3 files

scripts/basic/fixdep.c +5 −5
scripts/kconfig/confdata.c +1 −1
scripts/mkcompile_h +1 −1

scripts/kconfig/confdata.c+1−1

@@ -776,7 +776,7 @@ int conf_write_autoconf(void) · 775 unmodified lines
776		776
777	name = getenv("KCONFIG_AUTOHEADER");	777	name = getenv("KCONFIG_AUTOHEADER");
778	if (!name)	778	if (!name)
779	name = "include/linux/autoconf.h";	779	name = "include/generated/autoconf.h";
780	if (rename(".tmpconfig.h", name))	780	if (rename(".tmpconfig.h", name))
781	return 1;	781	return 1;
782	name = conf_get_autoconfig_name();	782	name = conf_get_autoconfig_name();

scripts/mkcompile_h+1−1

@@ -14,7 +14,7 @@ vecho() { [ "${quiet}" = "silent_" ] \|\| echo "$@" ; } · 13 unmodified lines
14	# So "sudo make install" won't change the "compiled by <user>"	14	# So "sudo make install" won't change the "compiled by <user>"
15	# do "compiled by root"	15	# do "compiled by root"
16		16
17	if [ -r $TARGET -a ! -O include/linux/autoconf.h ]; then	17	if [ -r $TARGET -a ! -O include/generated/autoconf.h ]; then
18	vecho " SKIPPED $TARGET"	18	vecho " SKIPPED $TARGET"
19	exit 0	19	exit 0
20	fi	20	fi

@@ -16,15 +16,15 @@ · 15 unmodified lines
16	* tells make when to remake a file.	16	* tells make when to remake a file.
17	*	17	*
18	* To use this list as-is however has the drawback that virtually	18	* To use this list as-is however has the drawback that virtually
19	* every file in the kernel includes <linux/autoconf.h>.	19	* every file in the kernel includes autoconf.h.
20	*	20	*
21	* If the user re-runs make *config, linux/autoconf.h will be	21	* If the user re-runs make *config, autoconf.h will be
22	* regenerated. make notices that and will rebuild every file which	22	* regenerated. make notices that and will rebuild every file which
23	* includes autoconf.h, i.e. basically all files. This is extremely	23	* includes autoconf.h, i.e. basically all files. This is extremely
24	* annoying if the user just changed CONFIG_HIS_DRIVER from n to m.	24	* annoying if the user just changed CONFIG_HIS_DRIVER from n to m.
25	*	25	*
26	* So we play the same trick that "mkdep" played before. We replace	26	* So we play the same trick that "mkdep" played before. We replace
27	* the dependency on linux/autoconf.h by a dependency on every config	27	* the dependency on autoconf.h by a dependency on every config
28	* option which is mentioned in any of the listed prequisites.	28	* option which is mentioned in any of the listed prequisites.
29	*	29	*
30	* kconfig populates a tree in include/config/ with an empty file	30	* kconfig populates a tree in include/config/ with an empty file
@@ -73,7 +73,7 @@ · 42 unmodified lines
73	* cmd_<target> = <cmdline>	73	* cmd_<target> = <cmdline>
74	*	74	*
75	* and then basically copies the .<target>.d file to stdout, in the	75	* and then basically copies the .<target>.d file to stdout, in the
76	* process filtering out the dependency on linux/autoconf.h and adding	76	* process filtering out the dependency on autoconf.h and adding
77	* dependencies on include/config/my/option.h for every	77	* dependencies on include/config/my/option.h for every
78	* CONFIG_MY_OPTION encountered in any of the prequisites.	78	* CONFIG_MY_OPTION encountered in any of the prequisites.
79	*	79	*
@@ -324,7 +324,7 @@ static void parse_dep_file(void *map, size_t len) · 244 unmodified lines
324	p++;	324	p++;
325	}	325	}
326	memcpy(s, m, p-m); s[p-m] = 0;	326	memcpy(s, m, p-m); s[p-m] = 0;
327	if (strrcmp(s, "include/linux/autoconf.h") &&	327	if (strrcmp(s, "include/generated/autoconf.h") &&
328	strrcmp(s, "arch/um/include/uml-config.h") &&	328	strrcmp(s, "arch/um/include/uml-config.h") &&
329	strrcmp(s, ".ver")) {	329	strrcmp(s, ".ver")) {
330	printf(" %s \\\n", s);	330	printf(" %s \\\n", s);