From 466cbfef1b3707392eb94a67d5e1eea3486dcec9 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Fri, 5 Aug 2011 13:26:55 -0700 Subject: [PATCH] gyp: fix makefile build --- .gitignore | 5 ++--- gyp/{node.gyp => all.gyp} | 0 gyp/gyp_node | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) rename gyp/{node.gyp => all.gyp} (100%) diff --git a/.gitignore b/.gitignore index 433f178f03..4f4ca65766 100644 --- a/.gitignore +++ b/.gitignore @@ -14,9 +14,8 @@ node_g gyp-mac-tool gyp/gyp -gyp/node.Makefile -gyp/js2c.host.mk -gyp/node.target.mk +gyp/all.Makefile +gyp/all.target.mk gyp/node_js2c.host.mk gyp/node_js2c.target.mk out/ diff --git a/gyp/node.gyp b/gyp/all.gyp similarity index 100% rename from gyp/node.gyp rename to gyp/all.gyp diff --git a/gyp/gyp_node b/gyp/gyp_node index e3e75ccdac..bb30bce47a 100755 --- a/gyp/gyp_node +++ b/gyp/gyp_node @@ -19,7 +19,7 @@ def run_gyp(args): if __name__ == '__main__': args = sys.argv[1:] - args.append(os.path.join(script_dir, 'node.gyp')) + args.append(os.path.join(script_dir, 'all.gyp')) args.append('--depth=' + node_root) args.append('-Dtarget_arch=x64') args.append('-Dcomponent=static_library')