WIP

diff --git a/.gitignore b/.gitignore
index c020350..4d94a04 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
+
 .waf*
 tags
 .lock-wscript
 *.pyc
 doc/api.xml
-tools/nodejs.pc
 tmp/
 node
 node_g
@@ -16,4 +16,6 @@ gyp-mac-tool
 gyp/all.Makefile
 gyp/js2c.host.mk
 gyp/node.target.mk
+gyp/node_js2c.host.mk
 out/
+Makefile

diff --git a/deps/http_parser/http_parser.gyp b/deps/http_parser/http_parser.gyp
index e9183b8..3c0fd24 100644 (file)
--- a/deps/http_parser/http_parser.gyp
+++ b/deps/http_parser/http_parser.gyp
@@ -26,6 +26,7 @@
       },
       'defines': [ 'HTTP_PARSER_STRICT=0' ],
       'sources': [ './http_parser.c', ],
+<<<<<<< HEAD
       'conditions': [
         ['OS=="win"', {
           'msvs_settings': {
@@ -37,6 +38,8 @@
           },
         }]
       ],
+=======
+>>>>>>> WIP
     },
 
     {

diff --git a/gyp/all.gyp b/gyp/all.gyp
index 56ca175..a4c10dd 100644 (file)
--- a/gyp/all.gyp
+++ b/gyp/all.gyp
@@ -4,8 +4,9 @@
       'target_name': 'node',
       'type': 'executable',
       'dependencies': [
-#        '../deps/http_parser/http_parser.gyp:http_parser',
+        '../deps/http_parser/http_parser.gyp:http_parser',
         '../deps/v8/tools/gyp/v8.gyp:v8_snapshot',
+        '../deps/uv/build/all.gyp:uv',
         'node_js2c#host'
       ],
       'include_dirs': [ 'src' ],