Align SConscript files for gtest/gmock

2 files changed, 10 insertions, 20 deletions

diff --git a/lib/googletest-1.8.x/googlemock/SConscript b/lib/googletest-1.8.x/googlemock/SConscript
index 5a293b812a..f9a6db8ed9 100644
--- a/lib/googletest-1.8.x/googlemock/SConscript
+++ b/lib/googletest-1.8.x/googlemock/SConscript
@@ -1,27 +1,19 @@
-# Modified from gtest-1.3.0 by RJ Ryan
-
 Import('env')
 env = env.Clone()
 
-gmock_src_dir = env.Dir("./src")
-
-sources = [env.File(f, gmock_src_dir) for f in
-           ["gmock-all.cc",
-            "gmock-cardinalities.cc",
-            "gmock.cc",
-            "gmock-internal-utils.cc",
-            "gmock-matchers.cc",
-            "gmock-spec-builders.cc",]]
-
-gmock_main_sources = [env.File("gmock_main.cc", gmock_src_dir)] + sources
+# Add root and include folders
+env.Prepend(CPPPATH = ['.', '../include'])
 
-# Add the root and include/ directory
-env.Prepend(CPPPATH = ['.', './include'])
+# Sources used by base library and library that includes main.
+gmock_source = 'src/gmock-all.cc'
+gmock_main_source = 'src/gmock_main.cc'
 
+# gmock.lib to be used by most apps (if you have your own main
+# function)
 gmock = env.StaticLibrary(target='gmock',
-                          source=sources)
+                          source=[gmock_source])
 
 # gmock_main.lib can be used if you just want a basic main function;
-# it is also used by the tests for Google Mock itself.
+# it is also used by the tests for Google Test itself.
 gmock_main = env.StaticLibrary(target='gmock_main',
-                               source=gmock_main_sources)
+                               source=[gmock_source, gmock_main_source])
diff --git a/lib/googletest-1.8.x/googletest/SConscript b/lib/googletest-1.8.x/googletest/SConscript
index 303a8fbb9c..588fe1e63a 100644
--- a/lib/googletest-1.8.x/googletest/SConscript
+++ b/lib/googletest-1.8.x/googletest/SConscript
@@ -1,5 +1,3 @@
-#!/usr/bin/python2.4
-
 Import('env')
 env = env.Clone()