From 02fa32ba5e45e81f0581d1e3df5e66cf7896ee08 Mon Sep 17 00:00:00 2001 From: kunitoki Date: Wed, 6 Mar 2013 13:21:53 +0100 Subject: [PATCH] - last commit was wrong --- SConstruct | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/SConstruct b/SConstruct index 242b82b7e..b3b30c4fb 100644 --- a/SConstruct +++ b/SConstruct @@ -659,16 +659,16 @@ def update_linux_project_files(): ] def iterate_dirs(headers_content, source_content, d): - for root, subFolders, files in os.walk(d): - for f in files: - if f.endswith(".h") or f.endswith(".hpp"): - headers_content.append(" ../%s \\" % os.path.join(root, f)) - if f.endswith(".cpp") or f.endswith(".c"): - source_content.append(" ../%s \\" % os.path.join(root, f)) - for sd in subFolders: - if sd != "uninstall-": + if not "uninstall-" in d: + for root, subFolders, files in os.walk(d): + for f in files: + if f.endswith(".h") or f.endswith(".hpp"): + headers_content.append(" ../%s \\" % os.path.join(root, f)) + if f.endswith(".cpp") or f.endswith(".c"): + source_content.append(" ../%s \\" % os.path.join(root, f)) + for sd in subFolders: headers_content, source_content = \ - iterate_dirs(headers_content, source_content, sd) + iterate_dirs(headers_content, source_content, os.path.join(root, sd)) return headers_content, source_content for d in directories: