X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=004e67bf5512b53e1d55eaae7f32f250aa058c05;hb=36df6f5072b3e20cc97cbefba90697a19349faae;hp=c0c9ecb2a3d367047aee9a19b7eddbca8bea2c41;hpb=e72e844998a9b7e63e56d6c1ccc3ada8f5dad4d6;p=bertos.git

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index c0c9ecb2..004e67bf 100644
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -307,8 +307,7 @@ def csrcGenerator(project_info):
             for file in information["hw"]:
                 if file.endswith(".c"):
                     module_files |= set([hwdir + "/" + os.path.basename(file)])
-            for file_dependency in information["depends"]:
-                if file_dependency in files:
+            for file_dependency in information["depends"] + tuple(files.keys()):
                     dependencyCFiles, dependencySFiles = findModuleFiles(file_dependency, project_info)
                     dependency_files |= set(dependencyCFiles)
                     asm_files |= set(dependencySFiles)
@@ -713,10 +712,10 @@ def loadConfigurationInfos(path):
             if (type(configuration_infos[name]["informations"]["conditional_deps"]) == str or
                     type(configuration_infos[name]["informations"]["conditional_deps"]) == unicode):
                 configuration_infos[name]["informations"]["conditional_deps"] = (configuration_infos[name]["informations"]["conditional_deps"], )
-            elif type(configurations_infos[name]["informations"]["conditional_deps"]) == tuple:
+            elif type(configuration_infos[name]["informations"]["conditional_deps"]) == tuple:
                 pass
             else:
-                configurations_infos[name]["informations"]["conditional_deps"] = ()
+                configuration_infos[name]["informations"]["conditional_deps"] = ()
         configuration_infos[name]["description"] = description
         configuration_infos[name]["brief"] = brief
     return configuration_infos