build: add ninja support to Makefile

1 files changed, 10 insertions, 4 deletions

diff --git a/configure b/configure
index 3bf9b04879..50f265b237 100755
--- a/configure
+++ b/configure
@@ -167,7 +167,7 @@ parser.add_option("--with-arm-float-abi",
 
 parser.add_option("--ninja",
     action="store_true",
-    dest="ninja_build",
+    dest="use_ninja",
     help="Generate files for the ninja build system")
 
 (options, args) = parser.parse_args()
@@ -459,10 +459,16 @@ def write(filename, data):
 write('config.gypi', "# Do not edit. Generated by the configure script.\n" +
   pprint.pformat(output, indent=2) + "\n")
 
-write('config.mk', "# Do not edit. Generated by the configure script.\n" +
-  ("BUILDTYPE=%s\n" % ('Debug' if options.debug else 'Release')))
+config = {
+  'BUILDTYPE': 'Debug' if options.debug else 'Release',
+  'USE_NINJA': str(int(options.use_ninja or 0)),
+}
+config = '\n'.join(map('='.join, config.iteritems())) + '\n'
+
+write('config.mk',
+      '# Do not edit. Generated by the configure script.\n' + config)
 
-if options.ninja_build:
+if options.use_ninja:
   gyp_args = ['-f', 'ninja']
 elif os.name == 'nt':
   gyp_args = ['-f', 'msvs', '-G', 'msvs_version=2010']