From cf6891934297c51cd12bac3278b6e59df5e42f06 Mon Sep 17 00:00:00 2001 From: Vikas Rangarajan Date: Tue, 23 Mar 2010 12:31:32 -0700 Subject: Initial merge of local changes with master, main changes : - Distinguish between system and non-system headers for compilers that support it (g++) - only recurse dependencies for direct includes of current source --- .../net/sf/antcontrib/cpptasks/DependencyTable.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'src/main/java/net/sf/antcontrib/cpptasks/DependencyTable.java') diff --git a/src/main/java/net/sf/antcontrib/cpptasks/DependencyTable.java b/src/main/java/net/sf/antcontrib/cpptasks/DependencyTable.java index aaa3881..59ca033 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/DependencyTable.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/DependencyTable.java @@ -555,8 +555,21 @@ public final class DependencyTable { // for (int i = 0; i < includeInfos.length; i++) { DependencyInfo includeInfo = includeInfos[i]; - walkDependencies(task, includeInfo, compiler, stack, - visitor); + // Darren Sargent 23Oct2008 + // only recurse for direct includes of current source + // file + if (includeInfo.getSource().contains( + File.separatorChar + "src" + File.separatorChar + + "main") + || includeInfo.getSource().contains( + File.separatorChar + "src" + + File.separatorChar + "test")) { + task.log("Walking dependencies for " + + includeInfo.getSource(), + Project.MSG_VERBOSE); + walkDependencies(task, includeInfo, compiler, + stack, visitor); + } } } } -- cgit v1.2.3