Implement partial BUILDDIR support

[senf.git] / site_scons / senfutil.py

diff --git a/site_scons/senfutil.py b/site_scons/senfutil.py
index 9a4578b..bda8b3c 100644 (file)
--- a/site_scons/senfutil.py
+++ b/site_scons/senfutil.py
@@ -173,12 +173,17 @@ def DefaultOptions(env):
     )
 
 def Glob(env, exclude=[], subdirs=[]):
-    testSources = glob.glob("*.test.cc")
-    sources = [ x for x in glob.glob("*.cc") if x not in testSources and x not in exclude ]
+    testSources = env.Glob("*.test.cc", strings=True)
+    sources = [ x 
+                for x in env.Glob("*.cc", strings=True) 
+                if x not in testSources and x not in exclude ]
     for subdir in subdirs:
         testSources += glob.glob(os.path.join(subdir,"*.test.cc"))
-        sources += [ x for x in glob.glob(os.path.join(subdir,"*.cc"))
+        sources += [ x 
+                     for x in env.Glob(os.path.join(subdir,"*.cc"))
                      if x not in testSources and x not in exclude ]
+    sources.sort()
+    testSources.sort()
     return (sources, testSources)
 
 tagfiles = None