deps: reflect c-ares source tree

c-ares refactored their source tree in 1.17.0 which we did not apply in
our update to 1.17.1. This commit syncs our source with their new
structure for easier maintenance going forward.

Refs: c-ares/c-ares#349
Refs: nodejs#36207

deps/cares/cares.gyp

@@ -38,78 +38,78 @@
         'include/ares.h',
         'include/ares_rules.h',
         'include/ares_version.h',
-        'include/nameser.h',
-        'src/ares_android.c',
-        'src/ares_cancel.c',
-        'src/ares__close_sockets.c',
-        'src/ares_create_query.c',
-        'src/ares_data.c',
-        'src/ares_data.h',
-        'src/ares_destroy.c',
-        'src/ares_dns.h',
-        'src/ares_expand_name.c',
-        'src/ares_expand_string.c',
-        'src/ares_fds.c',
-        'src/ares_free_hostent.c',
-        'src/ares_free_string.c',
-        'src/ares_freeaddrinfo.c',
-        'src/ares_getenv.h',
-        'src/ares_getaddrinfo.c',
-        'src/ares_gethostbyaddr.c',
-        'src/ares_gethostbyname.c',
-        'src/ares__get_hostent.c',
-        'src/ares_getnameinfo.c',
-        'src/ares_getopt.c',
-        'src/ares_getopt.h',
-        'src/ares_getsock.c',
-        'src/ares_init.c',
-        'src/ares_ipv6.h',
-        'src/ares_library_init.c',
-        'src/ares_library_init.h',
-        'src/ares_llist.c',
-        'src/ares_llist.h',
-        'src/ares_mkquery.c',
-        'src/ares_nowarn.c',
-        'src/ares_nowarn.h',
-        'src/ares_options.c',
-        'src/ares__parse_into_addrinfo.c',
-        'src/ares_parse_aaaa_reply.c',
-        'src/ares_parse_a_reply.c',
-        'src/ares_parse_caa_reply.c',
-        'src/ares_parse_mx_reply.c',
-        'src/ares_parse_naptr_reply.c',
-        'src/ares_parse_ns_reply.c',
-        'src/ares_parse_ptr_reply.c',
-        'src/ares_parse_soa_reply.c',
-        'src/ares_parse_srv_reply.c',
-        'src/ares_parse_txt_reply.c',
-        'src/ares_platform.h',
-        'src/ares_private.h',
-        'src/ares_process.c',
-        'src/ares_query.c',
-        'src/ares__read_line.c',
-        'src/ares__readaddrinfo.c',
-        'src/ares_search.c',
-        'src/ares_send.c',
-        'src/ares_setup.h',
-        'src/ares__sortaddrinfo.c',
-        'src/ares_strcasecmp.c',
-        'src/ares_strcasecmp.h',
-        'src/ares_strdup.c',
-        'src/ares_strdup.h',
-        'src/ares_strerror.c',
-        'src/ares_strsplit.c',
-        'src/ares_timeout.c',
-        'src/ares__timeval.c',
-        'src/ares_version.c',
-        'src/ares_writev.c',
-        'src/ares_writev.h',
-        'src/bitncmp.c',
-        'src/bitncmp.h',
-        'src/inet_net_pton.c',
-        'src/inet_ntop.c',
-        'src/ares_inet_net_pton.h',
-        'src/setup_once.h',
+        'src/lib/nameser.h',
+        'src/lib/ares_android.c',
+        'src/lib/ares_cancel.c',
+        'src/lib/ares__close_sockets.c',
+        'src/lib/ares_create_query.c',
+        'src/lib/ares_data.c',
+        'src/lib/ares_data.h',
+        'src/lib/ares_destroy.c',
+        'src/include/ares_dns.h',
+        'src/lib/ares_expand_name.c',
+        'src/lib/ares_expand_string.c',
+        'src/lib/ares_fds.c',
+        'src/lib/ares_free_hostent.c',
+        'src/lib/ares_free_string.c',
+        'src/lib/ares_freeaddrinfo.c',
+        'src/lib/ares_getenv.h',
+        'src/lib/ares_getaddrinfo.c',
+        'src/lib/ares_gethostbyaddr.c',
+        'src/lib/ares_gethostbyname.c',
+        'src/lib/ares__get_hostent.c',
+        'src/lib/ares_getnameinfo.c',
+        'src/tools/ares_getopt.c',
+        'src/tools/ares_getopt.h',
+        'src/lib/ares_getsock.c',
+        'src/lib/ares_init.c',
+        'src/lib/ares_ipv6.h',
+        'src/lib/ares_library_init.c',
+        'src/lib/ares_library_init.h',
+        'src/lib/ares_llist.c',
+        'src/lib/ares_llist.h',
+        'src/lib/ares_mkquery.c',
+        'src/lib/ares_nowarn.c',
+        'src/lib/ares_nowarn.h',
+        'src/lib/ares_options.c',
+        'src/lib/ares__parse_into_addrinfo.c',
+        'src/lib/ares_parse_aaaa_reply.c',
+        'src/lib/ares_parse_a_reply.c',
+        'src/lib/ares_parse_caa_reply.c',
+        'src/lib/ares_parse_mx_reply.c',
+        'src/lib/ares_parse_naptr_reply.c',
+        'src/lib/ares_parse_ns_reply.c',
+        'src/lib/ares_parse_ptr_reply.c',
+        'src/lib/ares_parse_soa_reply.c',
+        'src/lib/ares_parse_srv_reply.c',
+        'src/lib/ares_parse_txt_reply.c',
+        'src/lib/ares_platform.h',
+        'src/lib/ares_private.h',
+        'src/lib/ares_process.c',
+        'src/lib/ares_query.c',
+        'src/lib/ares__read_line.c',
+        'src/lib/ares__readaddrinfo.c',
+        'src/lib/ares_search.c',
+        'src/lib/ares_send.c',
+        'src/lib/ares_setup.h',
+        'src/lib/ares__sortaddrinfo.c',
+        'src/lib/ares_strcasecmp.c',
+        'src/lib/ares_strcasecmp.h',
+        'src/lib/ares_strdup.c',
+        'src/lib/ares_strdup.h',
+        'src/lib/ares_strerror.c',
+        'src/lib/ares_strsplit.c',
+        'src/lib/ares_timeout.c',
+        'src/lib/ares__timeval.c',
+        'src/lib/ares_version.c',
+        'src/lib/ares_writev.c',
+        'src/lib/ares_writev.h',
+        'src/lib/bitncmp.c',
+        'src/lib/bitncmp.h',
+        'src/lib/inet_net_pton.c',
+        'src/lib/inet_ntop.c',
+        'src/lib/ares_inet_net_pton.h',
+        'src/lib/setup_once.h',
       ],
       'conditions': [
         [ 'library=="static_library"', {
@@ -124,11 +124,11 @@
           ],
           'include_dirs': [ 'config/win32' ],
           'sources': [
-            'src/config-win32.h',
-            'src/windows_port.c',
-            'src/ares_getenv.c',
-            'src/ares_iphlpapi.h',
-            'src/ares_platform.c'
+            'src/lib/config-win32.h',
+            'src/lib/windows_port.c',
+            'src/lib/ares_getenv.c',
+            'src/lib/ares_iphlpapi.h',
+            'src/lib/ares_platform.c'
           ],
           'libraries': [
             '-lws2_32.lib',