ninja/mac: Put dylibs directly into the product directory.

pylib/gyp/generator/ninja.py

Index: pylib/gyp/generator/ninja.py
===================================================================
--- pylib/gyp/generator/ninja.py	(revision 1132)
+++ pylib/gyp/generator/ninja.py	(working copy)
@@ -669,7 +669,6 @@
     path = self.ExpandSpecial(generator_default_variables['PRODUCT_DIR'])
     return os.path.join(path, self.xcode_settings.GetExecutablePath())
 
-
   def ComputeOutputFileName(self, spec):
     """Compute the filename of the final output for the current target."""
 
@@ -730,16 +729,17 @@
     # Executables and loadable modules go into the output root,
     # libraries go into shared library dir, and everything else
     # goes into the normal place.
-    if spec['type'] in ('executable', 'loadable_module'):
+    # On Mac, shared and static libraries go into the output root,
+    # too.

[Evan Martin, 2012/01/06 18:50:00]

Should we instead compute some sort of "output_dir" variable here and then use
in the below?  (That is, have some code here rather than this comment.)

Like:
dir = ''
if mac and other stuff:
  dir = ...
if some other thing
  dir = ...

The three line if condition below scares me.

[Nico, 2012/01/06 18:54:49]

Done.

+    if (spec['type'] in ('executable', 'loadable_module') or
+        self.flavor == 'mac' and self.toolset == 'target' and
+            spec['type'] in ('shared_library', 'static_library')):
       return filename
     elif spec['type'] == 'shared_library':
       libdir = 'lib'
       if self.toolset != 'target':
         libdir = 'lib/%s' % self.toolset
       return os.path.join(libdir, filename)
-    elif spec['type'] == 'static_library' and self.flavor == 'mac':
-      # Static libraries go into the output root on mac, too.
-      return filename
     else:
       return self.GypPathToUniqueOutput(filename, qualified=False)