diff options
author | Michal Marek <mmarek@suse.cz> | 2011-02-21 13:15:20 +0000 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2011-02-21 13:15:20 +0000 |
commit | 0412f8ad82f2e1058df85c2da384f1bea4aa1377 (patch) | |
tree | a63540a6ee1b4918db32d917d439f996b1fd1096 /scripts | |
parent | 175f7d80689b3709b77d5c28c2f19e19a916c495 (diff) | |
parent | b7bd182176960fdd139486cadb9962b39f8a2b50 (diff) |
Merge branch 'rc-fixes' into for-next
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/basic/fixdep.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index c9a16abacab4..6c94c6ce2925 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -315,6 +315,7 @@ static void parse_dep_file(void *map, size_t len) char *end = m + len; char *p; char s[PATH_MAX]; + int first; p = strchr(m, ':'); if (!p) { @@ -327,6 +328,7 @@ static void parse_dep_file(void *map, size_t len) clear_config(); + first = 1; while (m < end) { while (m < end && (*m == ' ' || *m == '\\' || *m == '\n')) m++; @@ -340,9 +342,17 @@ static void parse_dep_file(void *map, size_t len) if (strrcmp(s, "include/generated/autoconf.h") && strrcmp(s, "arch/um/include/uml-config.h") && strrcmp(s, ".ver")) { - printf(" %s \\\n", s); + /* + * Do not output the first dependency (the + * source file), so that kbuild is not confused + * if a .c file is rewritten into .S or vice + * versa. + */ + if (!first) + printf(" %s \\\n", s); do_config_file(s); } + first = 0; m = p + 1; } printf("\n%s: $(deps_%s)\n\n", target, target); |