|
@@ -2703,10 +2703,13 @@ expand_dependencies(const string ¶ms) {
|
|
|
vector<string> filenames;
|
|
vector<string> filenames;
|
|
|
tokenize_whitespace(expand_string(params), filenames);
|
|
tokenize_whitespace(expand_string(params), filenames);
|
|
|
|
|
|
|
|
|
|
+ PPDirectory *directory = get_directory();
|
|
|
|
|
+ assert(directory != (PPDirectory *)NULL);
|
|
|
|
|
+
|
|
|
vector<string> results;
|
|
vector<string> results;
|
|
|
vector<string>::const_iterator fi;
|
|
vector<string>::const_iterator fi;
|
|
|
for (fi = filenames.begin(); fi != filenames.end(); ++fi) {
|
|
for (fi = filenames.begin(); fi != filenames.end(); ++fi) {
|
|
|
- PPDependableFile *file = _directory->get_dependable_file(*fi, false);
|
|
|
|
|
|
|
+ PPDependableFile *file = directory->get_dependable_file(*fi, false);
|
|
|
assert(file != (PPDependableFile *)NULL);
|
|
assert(file != (PPDependableFile *)NULL);
|
|
|
|
|
|
|
|
vector<PPDependableFile *> files;
|
|
vector<PPDependableFile *> files;
|
|
@@ -2722,6 +2725,9 @@ expand_dependencies(const string ¶ms) {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ sort(results.begin(), results.end());
|
|
|
|
|
+ results.erase(unique(results.begin(), results.end()), results.end());
|
|
|
|
|
+
|
|
|
string result = repaste(results, " ");
|
|
string result = repaste(results, " ");
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|