make: don't use .target in paths or printouts

test/lib/TestGyp.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 TestGyp.py:  a testing framework for GYP integration tests.
 """
 
 import os
 import re
@@ skipping 353 matching lines @@
     else:
       message_target = target
     kw['stdout'] = "make: Nothing to be done for `%s'.\n" % message_target
     return self.build(gyp_file, target, **kw)
   def run_built_executable(self, name, *args, **kw):
     """
     Runs an executable built by Make.
     """
     configuration = self.configuration_dirname()
     libdir = os.path.join('out', configuration, 'lib')
-    # TODO(piman): when everything is cross-compile safe, remove lib.target
-    os.environ['LD_LIBRARY_PATH'] = libdir + '.host:' + libdir + '.target'
+    # TODO(piman): when everything is cross-compile safe, remove
+    # the trailing 'libdir' that pulls in target-compiled libs as well.
+    os.environ['LD_LIBRARY_PATH'] = libdir + '.host:' + libdir
     # Enclosing the name in a list avoids prepending the original dir.
     program = [self.built_file_path(name, type=self.EXECUTABLE, **kw)]
     return self.run(program=program, *args, **kw)
   def built_file_path(self, name, type=None, **kw):
     """
     Returns a path to the specified file name, of the specified type,
     as built by Make.
 
     Built files are in the subdirectory 'out/{configuration}'.
     The default is 'out/Default'.
 
     A chdir= keyword argument specifies the source directory
     relative to which  the output subdirectory can be found.
 
     "type" values of STATIC_LIB or SHARED_LIB append the necessary
     prefixes and suffixes to a platform-independent library base name.
 
     A subdir= keyword argument specifies a library subdirectory within
-    the default 'obj.target'.
+    the default 'obj'.
     """
     result = []
     chdir = kw.get('chdir')
     if chdir:
       result.append(chdir)
     configuration = self.configuration_dirname()
     result.extend(['out', configuration])
     if type == self.STATIC_LIB and sys.platform != 'darwin':
-      result.append('obj.target')
+      result.append('obj')
     elif type == self.SHARED_LIB and sys.platform != 'darwin':
-      result.append('lib.target')
+      result.append('lib')
     subdir = kw.get('subdir')
     if subdir:
       result.append(subdir)
     result.append(self.built_file_basename(name, type, **kw))
     return self.workpath(*result)
 
 
 class TestGypNinja(TestGypBase):
   """
   Subclass for testing the GYP Ninja generator.
@@ skipping 383 matching lines @@
   """
   format = kw.get('format')
   if format:
     del kw['format']
   else:
     format = os.environ.get('TESTGYP_FORMAT')
   for format_class in format_class_list:
     if format == format_class.format:
       return format_class(*args, **kw)
   raise Exception, "unknown format %r" % format