From ff199787ff59e968146ff5b5a3cfa67e8a0f2392 Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 16 Nov 2000 03:47:03 +0000 Subject: [PATCH] *** empty log message *** --- ppremake/configure.in | 2 +- ppremake/ppScope.cxx | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ppremake/configure.in b/ppremake/configure.in index 2b5855aefa..6efb6cd340 100644 --- a/ppremake/configure.in +++ b/ppremake/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(ppremake.cxx) -AM_INIT_AUTOMAKE(ppremake, 0.57) +AM_INIT_AUTOMAKE(ppremake, 0.58) AM_CONFIG_HEADER(config.h) AC_PREFIX_DEFAULT(/usr/local/panda) diff --git a/ppremake/ppScope.cxx b/ppremake/ppScope.cxx index 2aee6b330f..688b04a300 100644 --- a/ppremake/ppScope.cxx +++ b/ppremake/ppScope.cxx @@ -2703,10 +2703,13 @@ expand_dependencies(const string ¶ms) { vector filenames; tokenize_whitespace(expand_string(params), filenames); + PPDirectory *directory = get_directory(); + assert(directory != (PPDirectory *)NULL); + vector results; vector::const_iterator 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); vector 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, " "); return result; }