Commit 526396b7 authored by Masahiro Yamada's avatar Masahiro Yamada

kconfig: write Kconfig files to autoconf.cmd in order

Currently, include/config/autoconf.cmd saves included Kconfig files in
reverse order. While this is not a big deal, it is inconsistent with
other *.cmd files generated by fixdep.

Output the included Kconfig files in the included order.
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 73a6afc5
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
#include "lkc.h" #include "lkc.h"
struct gstr autoconf_cmd;
/* return true if 'path' exists, false otherwise */ /* return true if 'path' exists, false otherwise */
static bool is_present(const char *path) static bool is_present(const char *path)
{ {
...@@ -972,7 +974,6 @@ int conf_write(const char *name) ...@@ -972,7 +974,6 @@ int conf_write(const char *name)
static int conf_write_autoconf_cmd(const char *autoconf_name) static int conf_write_autoconf_cmd(const char *autoconf_name)
{ {
char name[PATH_MAX], tmp[PATH_MAX]; char name[PATH_MAX], tmp[PATH_MAX];
struct file *file;
FILE *out; FILE *out;
int ret; int ret;
...@@ -993,9 +994,7 @@ static int conf_write_autoconf_cmd(const char *autoconf_name) ...@@ -993,9 +994,7 @@ static int conf_write_autoconf_cmd(const char *autoconf_name)
return -1; return -1;
} }
fprintf(out, "deps_config := \\\n"); fputs(str_get(&autoconf_cmd), out);
for (file = file_list; file; file = file->next)
fprintf(out, "\t%s \\\n", file->name);
fprintf(out, "\n%s: $(deps_config)\n\n", autoconf_name); fprintf(out, "\n%s: $(deps_config)\n\n", autoconf_name);
......
...@@ -40,6 +40,7 @@ int zconf_lineno(void); ...@@ -40,6 +40,7 @@ int zconf_lineno(void);
const char *zconf_curname(void); const char *zconf_curname(void);
/* confdata.c */ /* confdata.c */
extern struct gstr autoconf_cmd;
const char *conf_get_configname(void); const char *conf_get_configname(void);
void set_all_choice_values(struct symbol *csym); void set_all_choice_values(struct symbol *csym);
......
...@@ -480,6 +480,10 @@ void conf_parse(const char *name) ...@@ -480,6 +480,10 @@ void conf_parse(const char *name)
struct symbol *sym; struct symbol *sym;
int i; int i;
autoconf_cmd = str_new();
str_printf(&autoconf_cmd, "deps_config := \\\n");
zconf_initscan(name); zconf_initscan(name);
_menu_init(); _menu_init();
......
...@@ -25,6 +25,9 @@ struct file *file_lookup(const char *name) ...@@ -25,6 +25,9 @@ struct file *file_lookup(const char *name)
file->name = xstrdup(name); file->name = xstrdup(name);
file->next = file_list; file->next = file_list;
file_list = file; file_list = file;
str_printf(&autoconf_cmd, "\t%s \\\n", name);
return file; return file;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment