From 51713aeda126c79cd431998cc5d8c17645d4a7db Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 21 Jun 2015 08:59:21 +0200 Subject: [PATCH] few more fixes (nw) --- src/build/makedep.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/build/makedep.py b/src/build/makedep.py index 6e8c3fd282d..72fe94e6d14 100644 --- a/src/build/makedep.py +++ b/src/build/makedep.py @@ -40,24 +40,27 @@ def add_c_if_exists(root, fullname): except IOError: ignore=1 -def add_rest_if_exists(root, srcfile): +def add_rest_if_exists(root, srcfile,folder): t = srcfile.rsplit('/', 2) if t[1]=='includes': t[2] = t[2].replace('.h','.c') t[1] = 'drivers' add_c_if_exists(root,"/".join(t)) + parse_file_for_deps(root, "/".join(t), folder) t[1] = 'machine' add_c_if_exists(root,"/".join(t)) + parse_file_for_deps(root, "/".join(t), folder) t[1] = 'video' add_c_if_exists(root,"/".join(t)) + parse_file_for_deps(root, "/".join(t), folder) t[1] = 'audio' add_c_if_exists(root,"/".join(t)) + parse_file_for_deps(root, "/".join(t), folder) def parse_file_for_deps(root, srcfile, folder): try: fp = open(root + srcfile, 'rb') except IOError: - sys.stderr.write("Unable to open source file '%s'\n" % srcfile) return 1 in_comment = 0 linenum = 0 @@ -98,7 +101,7 @@ def parse_file_for_deps(root, srcfile, folder): if fullname!='': deps_files_included.append(fullname) add_c_if_exists(root, fullname.replace('.h','.c')) - add_rest_if_exists(root, fullname) + add_rest_if_exists(root, fullname,folder) newfolder = fullname.rsplit('/', 1)[0] + '/' parse_file_for_deps(root, fullname, newfolder) continue @@ -155,7 +158,7 @@ def parse_file(root, srcfile, folder): newfolder = fullname.rsplit('/', 1)[0] + '/' parse_file(root, fullname, newfolder) if (fullname.endswith('.h')): - parse_file(root, fullname.replace('.h','.c'), folder) + parse_file(root, fullname.replace('.h','.c'), newfolder) continue return 0