kbuild: dependency generation fixes

o Fix a bug in fixdep.c, which could cause segfaults
o Make sure that we build fixdep first of all, since
  we need it to build host programs.

2 files changed, 17 insertions, 6 deletions

diff --git a/scripts/Makefile b/scripts/Makefile
index 11509a5bfd74..51dc632e2829 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -44,8 +44,20 @@ doc-progs: docproc
 
 # ---------------------------------------------------------------------------
 
+.PHONY: lxdialog
+
+lxdialog:
+	$(MAKE) -C lxdialog all
+
+# ---------------------------------------------------------------------------
+
 host-progs := fixdep split-include docproc tkparse
 
 tkparse-objs := tkparse.o tkcond.o tkgen.o
 
+# fixdep is needed to compile other host programs
+
+split-include docproc $(tkparse-objs) lxdialog: fixdep
+
+
 include $(TOPDIR)/Rules.make
diff --git a/scripts/fixdep.c b/scripts/fixdep.c
index d3a4c534cef6..576275914535 100644
--- a/scripts/fixdep.c
+++ b/scripts/fixdep.c
@@ -307,13 +307,12 @@ void parse_dep_file(void *map, size_t len)
 	clear_config();
 
 	while (m < end) {
-		while (*m == ' ' || *m == '\\' || *m == '\n')
+		while (m < end && (*m == ' ' || *m == '\\' || *m == '\n'))
 			m++;
-
-		p = strchr(m, ' ');
-		if (!p) {
-			p = end;
-			while (!isalpha(*p)) p--;
+		p = m;
+		while (p < end && *p != ' ') p++;
+		if (p == end) {
+			do p--; while (!isalnum(*p));
 			p++;
 		}
 		memcpy(s, m, p-m); s[p-m] = 0;