Move pcre to common targets

Author: aminya

binding.gyp

@@ -47,6 +47,7 @@
       'dependencies': [
         'zlib',
         'http_parser',
+        'pcre'
       ],
       # Automatically generated by using the following command in bash:
       # find "./deps/libgit2/src" -mindepth 1 -type f ! -path "./deps/libgit2/src/win32/*" ! -path "./deps/libgit2/src/unix/*" ! -path "./deps/libgit2/src/hash/*" -print0 | xargs -0 -I {} echo "        '{}',"
@@ -360,9 +361,6 @@
             'GIT_REGEX_BUILTIN',
             'GIT_SHA1_WIN32'
           ],
-          'dependencies': [
-            'pcre',
-          ],
           'link_settings': {
             'libraries': [
               '-lcrypt32.lib',
@@ -551,67 +549,61 @@
         }],
       ],
     },
-  ],
-  'conditions': [
-    ['OS=="win"', {
-      'targets': [
-          {
-            'target_name': 'pcre',
-            'win_delay_load_hook': 'false',
-            'type': 'static_library',
-            # Automatically generated by using the following command in bash:
-            # find "./deps/libgit2/deps/pcre" -regex ".*\.[h|c]" -print0 | xargs -0 -I {} echo "              '{}',"
-            'sources': [
-              './deps/libgit2/deps/pcre/pcre.h',
-              './deps/libgit2/deps/pcre/pcreposix.c',
-              './deps/libgit2/deps/pcre/pcreposix.h',
-              './deps/libgit2/deps/pcre/pcre_byte_order.c',
-              './deps/libgit2/deps/pcre/pcre_chartables.c',
-              './deps/libgit2/deps/pcre/pcre_compile.c',
-              './deps/libgit2/deps/pcre/pcre_config.c',
-              './deps/libgit2/deps/pcre/pcre_dfa_exec.c',
-              './deps/libgit2/deps/pcre/pcre_exec.c',
-              './deps/libgit2/deps/pcre/pcre_fullinfo.c',
-              './deps/libgit2/deps/pcre/pcre_get.c',
-              './deps/libgit2/deps/pcre/pcre_globals.c',
-              './deps/libgit2/deps/pcre/pcre_internal.h',
-              './deps/libgit2/deps/pcre/pcre_jit_compile.c',
-              './deps/libgit2/deps/pcre/pcre_maketables.c',
-              './deps/libgit2/deps/pcre/pcre_newline.c',
-              './deps/libgit2/deps/pcre/pcre_ord2utf8.c',
-              './deps/libgit2/deps/pcre/pcre_printint.c',
-              './deps/libgit2/deps/pcre/pcre_refcount.c',
-              './deps/libgit2/deps/pcre/pcre_string_utils.c',
-              './deps/libgit2/deps/pcre/pcre_study.c',
-              './deps/libgit2/deps/pcre/pcre_tables.c',
-              './deps/libgit2/deps/pcre/pcre_ucd.c',
-              './deps/libgit2/deps/pcre/pcre_valid_utf8.c',
-              './deps/libgit2/deps/pcre/pcre_version.c',
-              './deps/libgit2/deps/pcre/pcre_xclass.c',
-              './deps/libgit2/deps/pcre/ucp.h',
+    {
+      'target_name': 'pcre',
+      'win_delay_load_hook': 'false',
+      'type': 'static_library',
+      # Automatically generated by using the following command in bash:
+      # find "./deps/libgit2/deps/pcre" -regex ".*\.[h|c]" -print0 | xargs -0 -I {} echo "              '{}',"
+      'sources': [
+        './deps/libgit2/deps/pcre/pcre.h',
+        './deps/libgit2/deps/pcre/pcreposix.c',
+        './deps/libgit2/deps/pcre/pcreposix.h',
+        './deps/libgit2/deps/pcre/pcre_byte_order.c',
+        './deps/libgit2/deps/pcre/pcre_chartables.c',
+        './deps/libgit2/deps/pcre/pcre_compile.c',
+        './deps/libgit2/deps/pcre/pcre_config.c',
+        './deps/libgit2/deps/pcre/pcre_dfa_exec.c',
+        './deps/libgit2/deps/pcre/pcre_exec.c',
+        './deps/libgit2/deps/pcre/pcre_fullinfo.c',
+        './deps/libgit2/deps/pcre/pcre_get.c',
+        './deps/libgit2/deps/pcre/pcre_globals.c',
+        './deps/libgit2/deps/pcre/pcre_internal.h',
+        './deps/libgit2/deps/pcre/pcre_jit_compile.c',
+        './deps/libgit2/deps/pcre/pcre_maketables.c',
+        './deps/libgit2/deps/pcre/pcre_newline.c',
+        './deps/libgit2/deps/pcre/pcre_ord2utf8.c',
+        './deps/libgit2/deps/pcre/pcre_printint.c',
+        './deps/libgit2/deps/pcre/pcre_refcount.c',
+        './deps/libgit2/deps/pcre/pcre_string_utils.c',
+        './deps/libgit2/deps/pcre/pcre_study.c',
+        './deps/libgit2/deps/pcre/pcre_tables.c',
+        './deps/libgit2/deps/pcre/pcre_ucd.c',
+        './deps/libgit2/deps/pcre/pcre_valid_utf8.c',
+        './deps/libgit2/deps/pcre/pcre_version.c',
+        './deps/libgit2/deps/pcre/pcre_xclass.c',
+        './deps/libgit2/deps/pcre/ucp.h',
 
-             ],
-            'defines': [
-              'SUPPORT_PCRE8=1',
-              'LINK_SIZE=2',
-              'PARENS_NEST_LIMIT=250',
-              'MATCH_LIMIT=10000000',
-              'MATCH_LIMIT_RECURSION="MATCH_LIMIT"',
-              'NEWLINE="LF"',
-              'NO_RECURSE=1',
-              'POSIX_MALLOC_THRESHOLD=10',
-              'BSR_ANYCRLF=0',
-              'MAX_NAME_SIZE=32',
-              'MAX_NAME_COUNT=10000',
-            ],
-            'include_dirs': [],
-            'direct_dependent_settings': {
-              'include_dirs': [
-                'deps/libgit2/deps/pcre',
-              ],
-            },
-          },
-      ]
-    }]
-  ]
+       ],
+      'defines': [
+        'SUPPORT_PCRE8=1',
+        'LINK_SIZE=2',
+        'PARENS_NEST_LIMIT=250',
+        'MATCH_LIMIT=10000000',
+        'MATCH_LIMIT_RECURSION="MATCH_LIMIT"',
+        'NEWLINE="LF"',
+        'NO_RECURSE=1',
+        'POSIX_MALLOC_THRESHOLD=10',
+        'BSR_ANYCRLF=0',
+        'MAX_NAME_SIZE=32',
+        'MAX_NAME_COUNT=10000',
+      ],
+      'include_dirs': [],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          'deps/libgit2/deps/pcre',
+        ],
+      },
+    },
+  ],
 }