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

1 files changed, 15 insertions, 2 deletions

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);
+						}
                     }
                 }
             }