From ce8ff3031c36b069e1da42b0f3bf0373ca42f2a6 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Wed, 6 Jul 2011 15:28:18 -0700 Subject: [PATCH] src/ and include/ directories Helps #71 but does not update the MSVC files. --- Makefile | 89 ++++++++++--------- config-mingw.mk | 30 ++++--- config-unix.mk | 53 +++++------ desired-api.md => doc/desired-api.md | 0 iocp-links.html => doc/iocp-links.html | 0 {c-ares => include}/ares.h | 0 {c-ares => include}/ares_version.h | 0 {eio => include}/eio.h | 0 ngx-queue.h => include/ngx-queue.h | 0 tree.h => include/tree.h | 0 uv-unix.h => include/uv-unix.h | 2 +- uv-win.h => include/uv-win.h | 0 uv.h => include/uv.h | 2 +- {c-ares => src/ares}/AUTHORS | 0 {c-ares => src/ares}/CHANGES | 0 {c-ares => src/ares}/CMakeLists.txt | 0 {c-ares => src/ares}/NEWS | 0 {c-ares => src/ares}/README | 0 {c-ares => src/ares}/README.cares | 0 {c-ares => src/ares}/README.msvc | 0 {c-ares => src/ares}/README.node | 0 {c-ares => src/ares}/RELEASE-NOTES | 0 {c-ares => src/ares}/TODO | 0 {c-ares => src/ares}/ares__close_sockets.c | 0 {c-ares => src/ares}/ares__get_hostent.c | 0 {c-ares => src/ares}/ares__read_line.c | 0 {c-ares => src/ares}/ares__timeval.c | 0 {c-ares => src/ares}/ares_cancel.c | 0 {c-ares => src/ares}/ares_data.c | 0 {c-ares => src/ares}/ares_data.h | 0 {c-ares => src/ares}/ares_destroy.c | 0 {c-ares => src/ares}/ares_dns.h | 0 {c-ares => src/ares}/ares_expand_name.c | 0 {c-ares => src/ares}/ares_expand_string.c | 0 {c-ares => src/ares}/ares_fds.c | 0 {c-ares => src/ares}/ares_free_hostent.c | 0 {c-ares => src/ares}/ares_free_string.c | 0 {c-ares => src/ares}/ares_gethostbyaddr.c | 0 {c-ares => src/ares}/ares_gethostbyname.c | 0 {c-ares => src/ares}/ares_getnameinfo.c | 0 {c-ares => src/ares}/ares_getopt.c | 0 {c-ares => src/ares}/ares_getopt.h | 0 {c-ares => src/ares}/ares_getsock.c | 0 {c-ares => src/ares}/ares_init.c | 0 {c-ares => src/ares}/ares_ipv6.h | 0 {c-ares => src/ares}/ares_library_init.c | 0 {c-ares => src/ares}/ares_library_init.h | 0 {c-ares => src/ares}/ares_llist.c | 0 {c-ares => src/ares}/ares_llist.h | 0 {c-ares => src/ares}/ares_mkquery.c | 0 {c-ares => src/ares}/ares_nowarn.c | 0 {c-ares => src/ares}/ares_nowarn.h | 0 {c-ares => src/ares}/ares_options.c | 0 {c-ares => src/ares}/ares_parse_a_reply.c | 0 {c-ares => src/ares}/ares_parse_aaaa_reply.c | 0 {c-ares => src/ares}/ares_parse_mx_reply.c | 0 {c-ares => src/ares}/ares_parse_ns_reply.c | 0 {c-ares => src/ares}/ares_parse_ptr_reply.c | 0 {c-ares => src/ares}/ares_parse_srv_reply.c | 0 {c-ares => src/ares}/ares_parse_txt_reply.c | 0 {c-ares => src/ares}/ares_private.h | 0 {c-ares => src/ares}/ares_process.c | 0 {c-ares => src/ares}/ares_query.c | 0 {c-ares => src/ares}/ares_rules.h | 0 {c-ares => src/ares}/ares_search.c | 0 {c-ares => src/ares}/ares_send.c | 0 {c-ares => src/ares}/ares_setup.h | 0 {c-ares => src/ares}/ares_strcasecmp.c | 0 {c-ares => src/ares}/ares_strcasecmp.h | 0 {c-ares => src/ares}/ares_strdup.c | 0 {c-ares => src/ares}/ares_strdup.h | 0 {c-ares => src/ares}/ares_strerror.c | 0 {c-ares => src/ares}/ares_timeout.c | 0 {c-ares => src/ares}/ares_version.c | 0 {c-ares => src/ares}/ares_writev.c | 0 {c-ares => src/ares}/ares_writev.h | 0 {c-ares => src/ares}/bitncmp.c | 0 {c-ares => src/ares}/bitncmp.h | 0 {c-ares => src/ares}/config-win32.h | 0 .../ares}/config_cygwin/ares_config.h | 0 .../ares}/config_darwin/ares_config.h | 0 .../ares}/config_freebsd/ares_config.h | 0 .../ares}/config_linux/ares_config.h | 0 .../ares}/config_openbsd/ares_config.h | 0 .../ares}/config_sunos/ares_config.h | 0 .../ares}/config_win32/ares_config.h | 0 {c-ares => src/ares}/get_ver.awk | 0 {c-ares => src/ares}/inet_net_pton.c | 0 {c-ares => src/ares}/inet_net_pton.h | 0 {c-ares => src/ares}/inet_ntop.c | 0 {c-ares => src/ares}/inet_ntop.h | 0 {c-ares => src/ares}/nameser.h | 0 {c-ares => src/ares}/setup_once.h | 0 {c-ares => src/ares}/windows_port.c | 0 {eio => src/eio}/Changes | 0 {eio => src/eio}/LICENSE | 0 {eio => src/eio}/Makefile.am | 0 {eio => src/eio}/aclocal.m4 | 0 {eio => src/eio}/autogen.sh | 0 {eio => src/eio}/config.h.in | 0 {eio => src/eio}/config_cygwin.h | 0 {eio => src/eio}/config_darwin.h | 0 {eio => src/eio}/config_freebsd.h | 0 {eio => src/eio}/config_linux.h | 0 {eio => src/eio}/config_sunos.h | 0 {eio => src/eio}/configure.ac | 0 {eio => src/eio}/demo.c | 0 {eio => src/eio}/eio.3 | 0 {eio => src/eio}/eio.c | 0 {eio => src/eio}/eio.pod | 0 {eio => src/eio}/libeio.m4 | 0 {eio => src/eio}/xthread.h | 0 {ev => src/ev}/Changes | 0 {ev => src/ev}/LICENSE | 0 {ev => src/ev}/Makefile.am | 0 {ev => src/ev}/Makefile.in | 0 {ev => src/ev}/README | 0 {ev => src/ev}/aclocal.m4 | 0 {ev => src/ev}/autogen.sh | 0 {ev => src/ev}/config.guess | 0 {ev => src/ev}/config.h.in | 0 {ev => src/ev}/config.sub | 0 {ev => src/ev}/config_cygwin.h | 0 {ev => src/ev}/config_darwin.h | 0 {ev => src/ev}/config_freebsd.h | 0 {ev => src/ev}/config_linux.h | 0 {ev => src/ev}/config_sunos.h | 0 {ev => src/ev}/configure | 0 {ev => src/ev}/configure.ac | 0 {ev => src/ev}/depcomp | 0 {ev => src/ev}/ev++.h | 0 {ev => src/ev}/ev.3 | 0 {ev => src/ev}/ev.c | 0 {ev => src/ev}/ev.h | 0 {ev => src/ev}/ev.pod | 0 {ev => src/ev}/ev_epoll.c | 0 {ev => src/ev}/ev_kqueue.c | 0 {ev => src/ev}/ev_poll.c | 0 {ev => src/ev}/ev_port.c | 0 {ev => src/ev}/ev_select.c | 0 {ev => src/ev}/ev_vars.h | 0 {ev => src/ev}/ev_win32.c | 0 {ev => src/ev}/ev_wrap.h | 0 {ev => src/ev}/event.c | 0 {ev => src/ev}/event.h | 0 {ev => src/ev}/install-sh | 0 {ev => src/ev}/libev.m4 | 0 {ev => src/ev}/ltmain.sh | 0 {ev => src/ev}/missing | 0 {ev => src/ev}/mkinstalldirs | 0 uv-common.c => src/uv-common.c | 2 +- uv-common.h => src/uv-common.h | 0 uv-cygwin.c => src/uv-cygwin.c | 0 uv-darwin.c => src/uv-darwin.c | 0 uv-eio.c => src/uv-eio.c | 0 uv-eio.h => src/uv-eio.h | 0 uv-freebsd.c => src/uv-freebsd.c | 0 uv-linux.c => src/uv-linux.c | 0 uv-sunos.c => src/uv-sunos.c | 0 uv-unix.c => src/uv-unix.c | 0 uv-win.c => src/uv-win.c | 0 test/benchmark-ares.c | 2 +- test/benchmark-getaddrinfo.c | 2 +- test/benchmark-ping-pongs.c | 2 +- test/benchmark-pump.c | 2 +- test/benchmark-sizes.c | 2 +- test/dns-server.c | 2 +- test/echo-server.c | 2 +- test/test-async.c | 2 +- test/test-bind-error.c | 2 +- test/test-bind6-error.c | 2 +- test/test-callback-stack.c | 2 +- test/test-connection-fail.c | 2 +- test/test-delayed-accept.c | 2 +- test/test-get-currentexe.c | 2 +- test/test-getaddrinfo.c | 2 +- test/test-gethostbyname.c | 2 +- test/test-hrtime.c | 2 +- test/test-loop-handles.c | 2 +- test/test-ping-pong.c | 2 +- test/test-shutdown-eof.c | 2 +- test/test-tcp-writealot.c | 2 +- test/test-timer-again.c | 2 +- test/test-timer.c | 2 +- 184 files changed, 114 insertions(+), 110 deletions(-) rename desired-api.md => doc/desired-api.md (100%) rename iocp-links.html => doc/iocp-links.html (100%) rename {c-ares => include}/ares.h (100%) rename {c-ares => include}/ares_version.h (100%) rename {eio => include}/eio.h (100%) rename ngx-queue.h => include/ngx-queue.h (100%) rename tree.h => include/tree.h (100%) rename uv-unix.h => include/uv-unix.h (99%) rename uv-win.h => include/uv-win.h (100%) rename uv.h => include/uv.h (99%) rename {c-ares => src/ares}/AUTHORS (100%) rename {c-ares => src/ares}/CHANGES (100%) rename {c-ares => src/ares}/CMakeLists.txt (100%) rename {c-ares => src/ares}/NEWS (100%) rename {c-ares => src/ares}/README (100%) rename {c-ares => src/ares}/README.cares (100%) rename {c-ares => src/ares}/README.msvc (100%) rename {c-ares => src/ares}/README.node (100%) rename {c-ares => src/ares}/RELEASE-NOTES (100%) rename {c-ares => src/ares}/TODO (100%) rename {c-ares => src/ares}/ares__close_sockets.c (100%) rename {c-ares => src/ares}/ares__get_hostent.c (100%) rename {c-ares => src/ares}/ares__read_line.c (100%) rename {c-ares => src/ares}/ares__timeval.c (100%) rename {c-ares => src/ares}/ares_cancel.c (100%) rename {c-ares => src/ares}/ares_data.c (100%) rename {c-ares => src/ares}/ares_data.h (100%) rename {c-ares => src/ares}/ares_destroy.c (100%) rename {c-ares => src/ares}/ares_dns.h (100%) rename {c-ares => src/ares}/ares_expand_name.c (100%) rename {c-ares => src/ares}/ares_expand_string.c (100%) rename {c-ares => src/ares}/ares_fds.c (100%) rename {c-ares => src/ares}/ares_free_hostent.c (100%) rename {c-ares => src/ares}/ares_free_string.c (100%) rename {c-ares => src/ares}/ares_gethostbyaddr.c (100%) rename {c-ares => src/ares}/ares_gethostbyname.c (100%) rename {c-ares => src/ares}/ares_getnameinfo.c (100%) rename {c-ares => src/ares}/ares_getopt.c (100%) rename {c-ares => src/ares}/ares_getopt.h (100%) rename {c-ares => src/ares}/ares_getsock.c (100%) rename {c-ares => src/ares}/ares_init.c (100%) rename {c-ares => src/ares}/ares_ipv6.h (100%) rename {c-ares => src/ares}/ares_library_init.c (100%) rename {c-ares => src/ares}/ares_library_init.h (100%) rename {c-ares => src/ares}/ares_llist.c (100%) rename {c-ares => src/ares}/ares_llist.h (100%) rename {c-ares => src/ares}/ares_mkquery.c (100%) rename {c-ares => src/ares}/ares_nowarn.c (100%) rename {c-ares => src/ares}/ares_nowarn.h (100%) rename {c-ares => src/ares}/ares_options.c (100%) rename {c-ares => src/ares}/ares_parse_a_reply.c (100%) rename {c-ares => src/ares}/ares_parse_aaaa_reply.c (100%) rename {c-ares => src/ares}/ares_parse_mx_reply.c (100%) rename {c-ares => src/ares}/ares_parse_ns_reply.c (100%) rename {c-ares => src/ares}/ares_parse_ptr_reply.c (100%) rename {c-ares => src/ares}/ares_parse_srv_reply.c (100%) rename {c-ares => src/ares}/ares_parse_txt_reply.c (100%) rename {c-ares => src/ares}/ares_private.h (100%) rename {c-ares => src/ares}/ares_process.c (100%) rename {c-ares => src/ares}/ares_query.c (100%) rename {c-ares => src/ares}/ares_rules.h (100%) rename {c-ares => src/ares}/ares_search.c (100%) rename {c-ares => src/ares}/ares_send.c (100%) rename {c-ares => src/ares}/ares_setup.h (100%) rename {c-ares => src/ares}/ares_strcasecmp.c (100%) rename {c-ares => src/ares}/ares_strcasecmp.h (100%) rename {c-ares => src/ares}/ares_strdup.c (100%) rename {c-ares => src/ares}/ares_strdup.h (100%) rename {c-ares => src/ares}/ares_strerror.c (100%) rename {c-ares => src/ares}/ares_timeout.c (100%) rename {c-ares => src/ares}/ares_version.c (100%) rename {c-ares => src/ares}/ares_writev.c (100%) rename {c-ares => src/ares}/ares_writev.h (100%) rename {c-ares => src/ares}/bitncmp.c (100%) rename {c-ares => src/ares}/bitncmp.h (100%) rename {c-ares => src/ares}/config-win32.h (100%) rename {c-ares => src/ares}/config_cygwin/ares_config.h (100%) rename {c-ares => src/ares}/config_darwin/ares_config.h (100%) rename {c-ares => src/ares}/config_freebsd/ares_config.h (100%) rename {c-ares => src/ares}/config_linux/ares_config.h (100%) rename {c-ares => src/ares}/config_openbsd/ares_config.h (100%) rename {c-ares => src/ares}/config_sunos/ares_config.h (100%) rename {c-ares => src/ares}/config_win32/ares_config.h (100%) rename {c-ares => src/ares}/get_ver.awk (100%) rename {c-ares => src/ares}/inet_net_pton.c (100%) rename {c-ares => src/ares}/inet_net_pton.h (100%) rename {c-ares => src/ares}/inet_ntop.c (100%) rename {c-ares => src/ares}/inet_ntop.h (100%) rename {c-ares => src/ares}/nameser.h (100%) rename {c-ares => src/ares}/setup_once.h (100%) rename {c-ares => src/ares}/windows_port.c (100%) rename {eio => src/eio}/Changes (100%) rename {eio => src/eio}/LICENSE (100%) rename {eio => src/eio}/Makefile.am (100%) rename {eio => src/eio}/aclocal.m4 (100%) rename {eio => src/eio}/autogen.sh (100%) rename {eio => src/eio}/config.h.in (100%) rename {eio => src/eio}/config_cygwin.h (100%) rename {eio => src/eio}/config_darwin.h (100%) rename {eio => src/eio}/config_freebsd.h (100%) rename {eio => src/eio}/config_linux.h (100%) rename {eio => src/eio}/config_sunos.h (100%) rename {eio => src/eio}/configure.ac (100%) rename {eio => src/eio}/demo.c (100%) rename {eio => src/eio}/eio.3 (100%) rename {eio => src/eio}/eio.c (100%) rename {eio => src/eio}/eio.pod (100%) rename {eio => src/eio}/libeio.m4 (100%) rename {eio => src/eio}/xthread.h (100%) rename {ev => src/ev}/Changes (100%) rename {ev => src/ev}/LICENSE (100%) rename {ev => src/ev}/Makefile.am (100%) rename {ev => src/ev}/Makefile.in (100%) rename {ev => src/ev}/README (100%) rename {ev => src/ev}/aclocal.m4 (100%) rename {ev => src/ev}/autogen.sh (100%) rename {ev => src/ev}/config.guess (100%) rename {ev => src/ev}/config.h.in (100%) rename {ev => src/ev}/config.sub (100%) rename {ev => src/ev}/config_cygwin.h (100%) rename {ev => src/ev}/config_darwin.h (100%) rename {ev => src/ev}/config_freebsd.h (100%) rename {ev => src/ev}/config_linux.h (100%) rename {ev => src/ev}/config_sunos.h (100%) rename {ev => src/ev}/configure (100%) rename {ev => src/ev}/configure.ac (100%) rename {ev => src/ev}/depcomp (100%) rename {ev => src/ev}/ev++.h (100%) rename {ev => src/ev}/ev.3 (100%) rename {ev => src/ev}/ev.c (100%) rename {ev => src/ev}/ev.h (100%) rename {ev => src/ev}/ev.pod (100%) rename {ev => src/ev}/ev_epoll.c (100%) rename {ev => src/ev}/ev_kqueue.c (100%) rename {ev => src/ev}/ev_poll.c (100%) rename {ev => src/ev}/ev_port.c (100%) rename {ev => src/ev}/ev_select.c (100%) rename {ev => src/ev}/ev_vars.h (100%) rename {ev => src/ev}/ev_win32.c (100%) rename {ev => src/ev}/ev_wrap.h (100%) rename {ev => src/ev}/event.c (100%) rename {ev => src/ev}/event.h (100%) rename {ev => src/ev}/install-sh (100%) rename {ev => src/ev}/libev.m4 (100%) rename {ev => src/ev}/ltmain.sh (100%) rename {ev => src/ev}/missing (100%) rename {ev => src/ev}/mkinstalldirs (100%) rename uv-common.c => src/uv-common.c (99%) rename uv-common.h => src/uv-common.h (100%) rename uv-cygwin.c => src/uv-cygwin.c (100%) rename uv-darwin.c => src/uv-darwin.c (100%) rename uv-eio.c => src/uv-eio.c (100%) rename uv-eio.h => src/uv-eio.h (100%) rename uv-freebsd.c => src/uv-freebsd.c (100%) rename uv-linux.c => src/uv-linux.c (100%) rename uv-sunos.c => src/uv-sunos.c (100%) rename uv-unix.c => src/uv-unix.c (100%) rename uv-win.c => src/uv-win.c (100%) diff --git a/Makefile b/Makefile index 5c0ce0db..d9de2aa2 100644 --- a/Makefile +++ b/Makefile @@ -24,51 +24,52 @@ ifdef MSVC uname_S := MINGW endif -CPPFLAGS += -Ic-ares/ +CPPFLAGS += -Iinclude + CARES_OBJS = -CARES_OBJS += c-ares/ares__close_sockets.o -CARES_OBJS += c-ares/ares__get_hostent.o -CARES_OBJS += c-ares/ares__read_line.o -CARES_OBJS += c-ares/ares__timeval.o -CARES_OBJS += c-ares/ares_cancel.o -CARES_OBJS += c-ares/ares_data.o -CARES_OBJS += c-ares/ares_destroy.o -CARES_OBJS += c-ares/ares_expand_name.o -CARES_OBJS += c-ares/ares_expand_string.o -CARES_OBJS += c-ares/ares_fds.o -CARES_OBJS += c-ares/ares_free_hostent.o -CARES_OBJS += c-ares/ares_free_string.o -CARES_OBJS += c-ares/ares_gethostbyaddr.o -CARES_OBJS += c-ares/ares_gethostbyname.o -CARES_OBJS += c-ares/ares_getnameinfo.o -CARES_OBJS += c-ares/ares_getopt.o -CARES_OBJS += c-ares/ares_getsock.o -CARES_OBJS += c-ares/ares_init.o -CARES_OBJS += c-ares/ares_library_init.o -CARES_OBJS += c-ares/ares_llist.o -CARES_OBJS += c-ares/ares_mkquery.o -CARES_OBJS += c-ares/ares_nowarn.o -CARES_OBJS += c-ares/ares_options.o -CARES_OBJS += c-ares/ares_parse_a_reply.o -CARES_OBJS += c-ares/ares_parse_aaaa_reply.o -CARES_OBJS += c-ares/ares_parse_mx_reply.o -CARES_OBJS += c-ares/ares_parse_ns_reply.o -CARES_OBJS += c-ares/ares_parse_ptr_reply.o -CARES_OBJS += c-ares/ares_parse_srv_reply.o -CARES_OBJS += c-ares/ares_parse_txt_reply.o -CARES_OBJS += c-ares/ares_process.o -CARES_OBJS += c-ares/ares_query.o -CARES_OBJS += c-ares/ares_search.o -CARES_OBJS += c-ares/ares_send.o -CARES_OBJS += c-ares/ares_strcasecmp.o -CARES_OBJS += c-ares/ares_strdup.o -CARES_OBJS += c-ares/ares_strerror.o -CARES_OBJS += c-ares/ares_timeout.o -CARES_OBJS += c-ares/ares_version.o -CARES_OBJS += c-ares/ares_writev.o -CARES_OBJS += c-ares/bitncmp.o -CARES_OBJS += c-ares/inet_net_pton.o -CARES_OBJS += c-ares/inet_ntop.o +CARES_OBJS += src/ares/ares__close_sockets.o +CARES_OBJS += src/ares/ares__get_hostent.o +CARES_OBJS += src/ares/ares__read_line.o +CARES_OBJS += src/ares/ares__timeval.o +CARES_OBJS += src/ares/ares_cancel.o +CARES_OBJS += src/ares/ares_data.o +CARES_OBJS += src/ares/ares_destroy.o +CARES_OBJS += src/ares/ares_expand_name.o +CARES_OBJS += src/ares/ares_expand_string.o +CARES_OBJS += src/ares/ares_fds.o +CARES_OBJS += src/ares/ares_free_hostent.o +CARES_OBJS += src/ares/ares_free_string.o +CARES_OBJS += src/ares/ares_gethostbyaddr.o +CARES_OBJS += src/ares/ares_gethostbyname.o +CARES_OBJS += src/ares/ares_getnameinfo.o +CARES_OBJS += src/ares/ares_getopt.o +CARES_OBJS += src/ares/ares_getsock.o +CARES_OBJS += src/ares/ares_init.o +CARES_OBJS += src/ares/ares_library_init.o +CARES_OBJS += src/ares/ares_llist.o +CARES_OBJS += src/ares/ares_mkquery.o +CARES_OBJS += src/ares/ares_nowarn.o +CARES_OBJS += src/ares/ares_options.o +CARES_OBJS += src/ares/ares_parse_a_reply.o +CARES_OBJS += src/ares/ares_parse_aaaa_reply.o +CARES_OBJS += src/ares/ares_parse_mx_reply.o +CARES_OBJS += src/ares/ares_parse_ns_reply.o +CARES_OBJS += src/ares/ares_parse_ptr_reply.o +CARES_OBJS += src/ares/ares_parse_srv_reply.o +CARES_OBJS += src/ares/ares_parse_txt_reply.o +CARES_OBJS += src/ares/ares_process.o +CARES_OBJS += src/ares/ares_query.o +CARES_OBJS += src/ares/ares_search.o +CARES_OBJS += src/ares/ares_send.o +CARES_OBJS += src/ares/ares_strcasecmp.o +CARES_OBJS += src/ares/ares_strdup.o +CARES_OBJS += src/ares/ares_strerror.o +CARES_OBJS += src/ares/ares_timeout.o +CARES_OBJS += src/ares/ares_version.o +CARES_OBJS += src/ares/ares_writev.o +CARES_OBJS += src/ares/bitncmp.o +CARES_OBJS += src/ares/inet_net_pton.o +CARES_OBJS += src/ares/inet_ntop.o ifneq (,$(findstring MINGW,$(uname_S))) include config-mingw.mk diff --git a/config-mingw.mk b/config-mingw.mk index f1f1ce9e..a115277a 100644 --- a/config-mingw.mk +++ b/config-mingw.mk @@ -24,38 +24,40 @@ CC = $(PREFIX)gcc AR = $(PREFIX)ar E=.exe -CFLAGS=-g --std=gnu89 -D_WIN32_WINNT=0x0501 -Ic-ares/config_win32 +CFLAGS=$(CPPFLAGS) -g --std=gnu89 -D_WIN32_WINNT=0x0501 -Isrc/ares/config_win32 LINKFLAGS=-lm -CARES_OBJS += c-ares/windows_port.o +CARES_OBJS += src/ares/windows_port.o RUNNER_CFLAGS=$(CFLAGS) -D_GNU_SOURCE # Need _GNU_SOURCE for strdup? RUNNER_LINKFLAGS=$(LINKFLAGS) RUNNER_LIBS=-lws2_32 RUNNER_SRC=test/runner-win.c -uv.a: uv-win.o uv-common.o uv-eio.o eio/eio.o $(CARES_OBJS) - $(AR) rcs uv.a uv-win.o uv-common.o uv-eio.o eio/eio.o $(CARES_OBJS) +uv.a: src/uv-win.o src/uv-common.o src/uv-eio.o src/eio/eio.o $(CARES_OBJS) + $(AR) rcs uv.a src/uv-win.o src/uv-common.o src/uv-eio.o src/eio/eio.o $(CARES_OBJS) -uv-win.o: uv-win.c uv.h uv-win.h - $(CC) $(CFLAGS) -c uv-win.c -o uv-win.o +src/uv-win.o: src/uv-win.c include/uv.h include/uv-win.h + $(CC) $(CFLAGS) -c src/uv-win.c -o src/uv-win.o -uv-common.o: uv-common.c uv.h uv-win.h - $(CC) $(CFLAGS) -c uv-common.c -o uv-common.o +src/uv-common.o: src/uv-common.c include/uv.h include/uv-win.h + $(CC) $(CFLAGS) -c src/uv-common.c -o src/uv-common.o EIO_CPPFLAGS += $(CPPFLAGS) EIO_CPPFLAGS += -DEIO_CONFIG_H=\"$(EIO_CONFIG)\" EIO_CPPFLAGS += -DEIO_STACKSIZE=65536 EIO_CPPFLAGS += -D_GNU_SOURCE -eio/eio.o: eio/eio.c - $(CC) $(EIO_CPPFLAGS) $(CFLAGS) -c eio/eio.c -o eio/eio.o +src/eio/eio.o: src/eio/eio.c + $(CC) $(EIO_CPPFLAGS) $(CFLAGS) -c src/eio/eio.c -o src/eio/eio.o -uv-eio.o: uv-eio.c - $(CC) $(CPPFLAGS) -Ieio/ $(CFLAGS) -c uv-eio.c -o uv-eio.o +src/uv-eio.o: src/uv-eio.c + $(CC) $(CPPFLAGS) -Isrc/eio/ $(CFLAGS) -c src/uv-eio.c -o src/uv-eio.o clean-platform: - -rm -f c-ares/*.o + -rm -f src/ares/*.o + -rm -f src/eio/*.o distclean-platform: - -rm -f c-ares/*.o + -rm -f src/ares/*.o + -rm -f src/eio/*.o diff --git a/config-unix.mk b/config-unix.mk index 4e503b3e..2def593b 100644 --- a/config-unix.mk +++ b/config-unix.mk @@ -22,6 +22,7 @@ CC = $(PREFIX)gcc AR = $(PREFIX)ar E= CFLAGS=--std=gnu89 -g +CPPFLAGS += -Isrc/ev LINKFLAGS=-lm CPPFLAGS += -D_LARGEFILE_SOURCE @@ -30,7 +31,7 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64 ifeq (SunOS,$(uname_S)) EV_CONFIG=config_sunos.h EIO_CONFIG=config_sunos.h -CPPFLAGS += -Ic-ares/config_sunos +CPPFLAGS += -Isrc/ares/config_sunos LINKFLAGS+=-lsocket -lnsl UV_OS_FILE=uv-sunos.c endif @@ -38,7 +39,7 @@ endif ifeq (Darwin,$(uname_S)) EV_CONFIG=config_darwin.h EIO_CONFIG=config_darwin.h -CPPFLAGS += -Ic-ares/config_darwin +CPPFLAGS += -Isrc/ares/config_darwin LINKFLAGS+=-framework CoreServices UV_OS_FILE=uv-darwin.c endif @@ -46,7 +47,7 @@ endif ifeq (Linux,$(uname_S)) EV_CONFIG=config_linux.h EIO_CONFIG=config_linux.h -CPPFLAGS += -Ic-ares/config_linux +CPPFLAGS += -Isrc/ares/config_linux LINKFLAGS+=-lrt UV_OS_FILE=uv-linux.c endif @@ -54,7 +55,7 @@ endif ifeq (FreeBSD,$(uname_S)) EV_CONFIG=config_freebsd.h EIO_CONFIG=config_freebsd.h -CPPFLAGS += -Ic-ares/config_freebsd +CPPFLAGS += -Isrc/ares/config_freebsd LINKFLAGS+= UV_OS_FILE=uv-freebsd.c endif @@ -62,7 +63,7 @@ endif ifneq (,$(findstring CYGWIN,$(uname_S))) EV_CONFIG=config_cygwin.h EIO_CONFIG=config_cygwin.h -CPPFLAGS += -Ic-ares/config_cygwin +CPPFLAGS += -Isrc/ares/config_cygwin LINKFLAGS+= UV_OS_FILE=uv-cygwin.c endif @@ -74,21 +75,21 @@ RUNNER_LINKFLAGS=$(LINKFLAGS) -pthread RUNNER_LIBS= RUNNER_SRC=test/runner-unix.c -uv.a: uv-unix.o uv-common.o uv-platform.o ev/ev.o uv-eio.o eio/eio.o $(CARES_OBJS) - $(AR) rcs uv.a uv-unix.o uv-platform.o uv-common.o uv-eio.o ev/ev.o \ - eio/eio.o $(CARES_OBJS) +uv.a: src/uv-unix.o src/uv-common.o src/uv-platform.o src/ev/ev.o src/uv-eio.o src/eio/eio.o $(CARES_OBJS) + $(AR) rcs uv.a src/uv-unix.o src/uv-platform.o src/uv-common.o src/uv-eio.o src/ev/ev.o \ + src/eio/eio.o $(CARES_OBJS) -uv-platform.o: $(UV_OS_FILE) uv.h uv-unix.h - $(CC) $(CPPFLAGS) $(CFLAGS) -c $(UV_OS_FILE) -o uv-platform.o +src/uv-platform.o: src/$(UV_OS_FILE) include/uv.h include/uv-unix.h + $(CC) $(CPPFLAGS) $(CFLAGS) -c src/$(UV_OS_FILE) -o src/uv-platform.o -uv-unix.o: uv-unix.c uv.h uv-unix.h - $(CC) $(CPPFLAGS) -Ieio $(CFLAGS) -c uv-unix.c -o uv-unix.o +src/uv-unix.o: src/uv-unix.c include/uv.h include/uv-unix.h + $(CC) $(CPPFLAGS) -Ieio $(CFLAGS) -c src/uv-unix.c -o src/uv-unix.o -uv-common.o: uv-common.c uv.h uv-unix.h - $(CC) $(CPPFLAGS) $(CFLAGS) -c uv-common.c -o uv-common.o +src/uv-common.o: src/uv-common.c include/uv.h include/uv-unix.h + $(CC) $(CPPFLAGS) $(CFLAGS) -c src/uv-common.c -o src/uv-common.o -ev/ev.o: ev/ev.c - $(CC) $(CPPFLAGS) $(CFLAGS) -c ev/ev.c -o ev/ev.o -DEV_CONFIG_H=\"$(EV_CONFIG)\" +src/ev/ev.o: src/ev/ev.c + $(CC) $(CPPFLAGS) $(CFLAGS) -c src/ev/ev.c -o src/ev/ev.o -DEV_CONFIG_H=\"$(EV_CONFIG)\" EIO_CPPFLAGS += $(CPPFLAGS) @@ -96,21 +97,21 @@ EIO_CPPFLAGS += -DEIO_CONFIG_H=\"$(EIO_CONFIG)\" EIO_CPPFLAGS += -DEIO_STACKSIZE=65536 EIO_CPPFLAGS += -D_GNU_SOURCE -eio/eio.o: eio/eio.c - $(CC) $(EIO_CPPFLAGS) $(CFLAGS) -c eio/eio.c -o eio/eio.o +src/eio/eio.o: src/eio/eio.c + $(CC) $(EIO_CPPFLAGS) $(CFLAGS) -c src/eio/eio.c -o src/eio/eio.o -uv-eio.o: uv-eio.c - $(CC) $(CPPFLAGS) -Ieio/ $(CFLAGS) -c uv-eio.c -o uv-eio.o +src/uv-eio.o: src/uv-eio.c + $(CC) $(CPPFLAGS) -Isrc/eio/ $(CFLAGS) -c src/uv-eio.c -o src/uv-eio.o clean-platform: - -rm -f c-ares/*.o - -rm -f ev/*.o - -rm -f eio/*.o + -rm -f src/ares/*.o + -rm -f src/ev/*.o + -rm -f src/eio/*.o -rm -rf test/run-tests.dSYM run-benchmarks.dSYM distclean-platform: - -rm -f c-ares/*.o - -rm -f ev/*.o - -rm -f eio/*.o + -rm -f src/ares/*.o + -rm -f src/ev/*.o + -rm -f src/eio/*.o -rm -rf test/run-tests.dSYM run-benchmarks.dSYM diff --git a/desired-api.md b/doc/desired-api.md similarity index 100% rename from desired-api.md rename to doc/desired-api.md diff --git a/iocp-links.html b/doc/iocp-links.html similarity index 100% rename from iocp-links.html rename to doc/iocp-links.html diff --git a/c-ares/ares.h b/include/ares.h similarity index 100% rename from c-ares/ares.h rename to include/ares.h diff --git a/c-ares/ares_version.h b/include/ares_version.h similarity index 100% rename from c-ares/ares_version.h rename to include/ares_version.h diff --git a/eio/eio.h b/include/eio.h similarity index 100% rename from eio/eio.h rename to include/eio.h diff --git a/ngx-queue.h b/include/ngx-queue.h similarity index 100% rename from ngx-queue.h rename to include/ngx-queue.h diff --git a/tree.h b/include/tree.h similarity index 100% rename from tree.h rename to include/tree.h diff --git a/uv-unix.h b/include/uv-unix.h similarity index 99% rename from uv-unix.h rename to include/uv-unix.h index f6c5134b..f68a7fd6 100644 --- a/uv-unix.h +++ b/include/uv-unix.h @@ -24,7 +24,7 @@ #include "ngx-queue.h" -#include "ev/ev.h" +#include "ev.h" #include #include diff --git a/uv-win.h b/include/uv-win.h similarity index 100% rename from uv-win.h rename to include/uv-win.h diff --git a/uv.h b/include/uv.h similarity index 99% rename from uv.h rename to include/uv.h index bd84c516..aa27179a 100644 --- a/uv.h +++ b/include/uv.h @@ -33,7 +33,7 @@ extern "C" { #include /* int64_t */ #include /* size_t */ -#include "c-ares/ares.h" +#include "ares.h" #ifndef _SSIZE_T_ typedef intptr_t ssize_t; diff --git a/c-ares/AUTHORS b/src/ares/AUTHORS similarity index 100% rename from c-ares/AUTHORS rename to src/ares/AUTHORS diff --git a/c-ares/CHANGES b/src/ares/CHANGES similarity index 100% rename from c-ares/CHANGES rename to src/ares/CHANGES diff --git a/c-ares/CMakeLists.txt b/src/ares/CMakeLists.txt similarity index 100% rename from c-ares/CMakeLists.txt rename to src/ares/CMakeLists.txt diff --git a/c-ares/NEWS b/src/ares/NEWS similarity index 100% rename from c-ares/NEWS rename to src/ares/NEWS diff --git a/c-ares/README b/src/ares/README similarity index 100% rename from c-ares/README rename to src/ares/README diff --git a/c-ares/README.cares b/src/ares/README.cares similarity index 100% rename from c-ares/README.cares rename to src/ares/README.cares diff --git a/c-ares/README.msvc b/src/ares/README.msvc similarity index 100% rename from c-ares/README.msvc rename to src/ares/README.msvc diff --git a/c-ares/README.node b/src/ares/README.node similarity index 100% rename from c-ares/README.node rename to src/ares/README.node diff --git a/c-ares/RELEASE-NOTES b/src/ares/RELEASE-NOTES similarity index 100% rename from c-ares/RELEASE-NOTES rename to src/ares/RELEASE-NOTES diff --git a/c-ares/TODO b/src/ares/TODO similarity index 100% rename from c-ares/TODO rename to src/ares/TODO diff --git a/c-ares/ares__close_sockets.c b/src/ares/ares__close_sockets.c similarity index 100% rename from c-ares/ares__close_sockets.c rename to src/ares/ares__close_sockets.c diff --git a/c-ares/ares__get_hostent.c b/src/ares/ares__get_hostent.c similarity index 100% rename from c-ares/ares__get_hostent.c rename to src/ares/ares__get_hostent.c diff --git a/c-ares/ares__read_line.c b/src/ares/ares__read_line.c similarity index 100% rename from c-ares/ares__read_line.c rename to src/ares/ares__read_line.c diff --git a/c-ares/ares__timeval.c b/src/ares/ares__timeval.c similarity index 100% rename from c-ares/ares__timeval.c rename to src/ares/ares__timeval.c diff --git a/c-ares/ares_cancel.c b/src/ares/ares_cancel.c similarity index 100% rename from c-ares/ares_cancel.c rename to src/ares/ares_cancel.c diff --git a/c-ares/ares_data.c b/src/ares/ares_data.c similarity index 100% rename from c-ares/ares_data.c rename to src/ares/ares_data.c diff --git a/c-ares/ares_data.h b/src/ares/ares_data.h similarity index 100% rename from c-ares/ares_data.h rename to src/ares/ares_data.h diff --git a/c-ares/ares_destroy.c b/src/ares/ares_destroy.c similarity index 100% rename from c-ares/ares_destroy.c rename to src/ares/ares_destroy.c diff --git a/c-ares/ares_dns.h b/src/ares/ares_dns.h similarity index 100% rename from c-ares/ares_dns.h rename to src/ares/ares_dns.h diff --git a/c-ares/ares_expand_name.c b/src/ares/ares_expand_name.c similarity index 100% rename from c-ares/ares_expand_name.c rename to src/ares/ares_expand_name.c diff --git a/c-ares/ares_expand_string.c b/src/ares/ares_expand_string.c similarity index 100% rename from c-ares/ares_expand_string.c rename to src/ares/ares_expand_string.c diff --git a/c-ares/ares_fds.c b/src/ares/ares_fds.c similarity index 100% rename from c-ares/ares_fds.c rename to src/ares/ares_fds.c diff --git a/c-ares/ares_free_hostent.c b/src/ares/ares_free_hostent.c similarity index 100% rename from c-ares/ares_free_hostent.c rename to src/ares/ares_free_hostent.c diff --git a/c-ares/ares_free_string.c b/src/ares/ares_free_string.c similarity index 100% rename from c-ares/ares_free_string.c rename to src/ares/ares_free_string.c diff --git a/c-ares/ares_gethostbyaddr.c b/src/ares/ares_gethostbyaddr.c similarity index 100% rename from c-ares/ares_gethostbyaddr.c rename to src/ares/ares_gethostbyaddr.c diff --git a/c-ares/ares_gethostbyname.c b/src/ares/ares_gethostbyname.c similarity index 100% rename from c-ares/ares_gethostbyname.c rename to src/ares/ares_gethostbyname.c diff --git a/c-ares/ares_getnameinfo.c b/src/ares/ares_getnameinfo.c similarity index 100% rename from c-ares/ares_getnameinfo.c rename to src/ares/ares_getnameinfo.c diff --git a/c-ares/ares_getopt.c b/src/ares/ares_getopt.c similarity index 100% rename from c-ares/ares_getopt.c rename to src/ares/ares_getopt.c diff --git a/c-ares/ares_getopt.h b/src/ares/ares_getopt.h similarity index 100% rename from c-ares/ares_getopt.h rename to src/ares/ares_getopt.h diff --git a/c-ares/ares_getsock.c b/src/ares/ares_getsock.c similarity index 100% rename from c-ares/ares_getsock.c rename to src/ares/ares_getsock.c diff --git a/c-ares/ares_init.c b/src/ares/ares_init.c similarity index 100% rename from c-ares/ares_init.c rename to src/ares/ares_init.c diff --git a/c-ares/ares_ipv6.h b/src/ares/ares_ipv6.h similarity index 100% rename from c-ares/ares_ipv6.h rename to src/ares/ares_ipv6.h diff --git a/c-ares/ares_library_init.c b/src/ares/ares_library_init.c similarity index 100% rename from c-ares/ares_library_init.c rename to src/ares/ares_library_init.c diff --git a/c-ares/ares_library_init.h b/src/ares/ares_library_init.h similarity index 100% rename from c-ares/ares_library_init.h rename to src/ares/ares_library_init.h diff --git a/c-ares/ares_llist.c b/src/ares/ares_llist.c similarity index 100% rename from c-ares/ares_llist.c rename to src/ares/ares_llist.c diff --git a/c-ares/ares_llist.h b/src/ares/ares_llist.h similarity index 100% rename from c-ares/ares_llist.h rename to src/ares/ares_llist.h diff --git a/c-ares/ares_mkquery.c b/src/ares/ares_mkquery.c similarity index 100% rename from c-ares/ares_mkquery.c rename to src/ares/ares_mkquery.c diff --git a/c-ares/ares_nowarn.c b/src/ares/ares_nowarn.c similarity index 100% rename from c-ares/ares_nowarn.c rename to src/ares/ares_nowarn.c diff --git a/c-ares/ares_nowarn.h b/src/ares/ares_nowarn.h similarity index 100% rename from c-ares/ares_nowarn.h rename to src/ares/ares_nowarn.h diff --git a/c-ares/ares_options.c b/src/ares/ares_options.c similarity index 100% rename from c-ares/ares_options.c rename to src/ares/ares_options.c diff --git a/c-ares/ares_parse_a_reply.c b/src/ares/ares_parse_a_reply.c similarity index 100% rename from c-ares/ares_parse_a_reply.c rename to src/ares/ares_parse_a_reply.c diff --git a/c-ares/ares_parse_aaaa_reply.c b/src/ares/ares_parse_aaaa_reply.c similarity index 100% rename from c-ares/ares_parse_aaaa_reply.c rename to src/ares/ares_parse_aaaa_reply.c diff --git a/c-ares/ares_parse_mx_reply.c b/src/ares/ares_parse_mx_reply.c similarity index 100% rename from c-ares/ares_parse_mx_reply.c rename to src/ares/ares_parse_mx_reply.c diff --git a/c-ares/ares_parse_ns_reply.c b/src/ares/ares_parse_ns_reply.c similarity index 100% rename from c-ares/ares_parse_ns_reply.c rename to src/ares/ares_parse_ns_reply.c diff --git a/c-ares/ares_parse_ptr_reply.c b/src/ares/ares_parse_ptr_reply.c similarity index 100% rename from c-ares/ares_parse_ptr_reply.c rename to src/ares/ares_parse_ptr_reply.c diff --git a/c-ares/ares_parse_srv_reply.c b/src/ares/ares_parse_srv_reply.c similarity index 100% rename from c-ares/ares_parse_srv_reply.c rename to src/ares/ares_parse_srv_reply.c diff --git a/c-ares/ares_parse_txt_reply.c b/src/ares/ares_parse_txt_reply.c similarity index 100% rename from c-ares/ares_parse_txt_reply.c rename to src/ares/ares_parse_txt_reply.c diff --git a/c-ares/ares_private.h b/src/ares/ares_private.h similarity index 100% rename from c-ares/ares_private.h rename to src/ares/ares_private.h diff --git a/c-ares/ares_process.c b/src/ares/ares_process.c similarity index 100% rename from c-ares/ares_process.c rename to src/ares/ares_process.c diff --git a/c-ares/ares_query.c b/src/ares/ares_query.c similarity index 100% rename from c-ares/ares_query.c rename to src/ares/ares_query.c diff --git a/c-ares/ares_rules.h b/src/ares/ares_rules.h similarity index 100% rename from c-ares/ares_rules.h rename to src/ares/ares_rules.h diff --git a/c-ares/ares_search.c b/src/ares/ares_search.c similarity index 100% rename from c-ares/ares_search.c rename to src/ares/ares_search.c diff --git a/c-ares/ares_send.c b/src/ares/ares_send.c similarity index 100% rename from c-ares/ares_send.c rename to src/ares/ares_send.c diff --git a/c-ares/ares_setup.h b/src/ares/ares_setup.h similarity index 100% rename from c-ares/ares_setup.h rename to src/ares/ares_setup.h diff --git a/c-ares/ares_strcasecmp.c b/src/ares/ares_strcasecmp.c similarity index 100% rename from c-ares/ares_strcasecmp.c rename to src/ares/ares_strcasecmp.c diff --git a/c-ares/ares_strcasecmp.h b/src/ares/ares_strcasecmp.h similarity index 100% rename from c-ares/ares_strcasecmp.h rename to src/ares/ares_strcasecmp.h diff --git a/c-ares/ares_strdup.c b/src/ares/ares_strdup.c similarity index 100% rename from c-ares/ares_strdup.c rename to src/ares/ares_strdup.c diff --git a/c-ares/ares_strdup.h b/src/ares/ares_strdup.h similarity index 100% rename from c-ares/ares_strdup.h rename to src/ares/ares_strdup.h diff --git a/c-ares/ares_strerror.c b/src/ares/ares_strerror.c similarity index 100% rename from c-ares/ares_strerror.c rename to src/ares/ares_strerror.c diff --git a/c-ares/ares_timeout.c b/src/ares/ares_timeout.c similarity index 100% rename from c-ares/ares_timeout.c rename to src/ares/ares_timeout.c diff --git a/c-ares/ares_version.c b/src/ares/ares_version.c similarity index 100% rename from c-ares/ares_version.c rename to src/ares/ares_version.c diff --git a/c-ares/ares_writev.c b/src/ares/ares_writev.c similarity index 100% rename from c-ares/ares_writev.c rename to src/ares/ares_writev.c diff --git a/c-ares/ares_writev.h b/src/ares/ares_writev.h similarity index 100% rename from c-ares/ares_writev.h rename to src/ares/ares_writev.h diff --git a/c-ares/bitncmp.c b/src/ares/bitncmp.c similarity index 100% rename from c-ares/bitncmp.c rename to src/ares/bitncmp.c diff --git a/c-ares/bitncmp.h b/src/ares/bitncmp.h similarity index 100% rename from c-ares/bitncmp.h rename to src/ares/bitncmp.h diff --git a/c-ares/config-win32.h b/src/ares/config-win32.h similarity index 100% rename from c-ares/config-win32.h rename to src/ares/config-win32.h diff --git a/c-ares/config_cygwin/ares_config.h b/src/ares/config_cygwin/ares_config.h similarity index 100% rename from c-ares/config_cygwin/ares_config.h rename to src/ares/config_cygwin/ares_config.h diff --git a/c-ares/config_darwin/ares_config.h b/src/ares/config_darwin/ares_config.h similarity index 100% rename from c-ares/config_darwin/ares_config.h rename to src/ares/config_darwin/ares_config.h diff --git a/c-ares/config_freebsd/ares_config.h b/src/ares/config_freebsd/ares_config.h similarity index 100% rename from c-ares/config_freebsd/ares_config.h rename to src/ares/config_freebsd/ares_config.h diff --git a/c-ares/config_linux/ares_config.h b/src/ares/config_linux/ares_config.h similarity index 100% rename from c-ares/config_linux/ares_config.h rename to src/ares/config_linux/ares_config.h diff --git a/c-ares/config_openbsd/ares_config.h b/src/ares/config_openbsd/ares_config.h similarity index 100% rename from c-ares/config_openbsd/ares_config.h rename to src/ares/config_openbsd/ares_config.h diff --git a/c-ares/config_sunos/ares_config.h b/src/ares/config_sunos/ares_config.h similarity index 100% rename from c-ares/config_sunos/ares_config.h rename to src/ares/config_sunos/ares_config.h diff --git a/c-ares/config_win32/ares_config.h b/src/ares/config_win32/ares_config.h similarity index 100% rename from c-ares/config_win32/ares_config.h rename to src/ares/config_win32/ares_config.h diff --git a/c-ares/get_ver.awk b/src/ares/get_ver.awk similarity index 100% rename from c-ares/get_ver.awk rename to src/ares/get_ver.awk diff --git a/c-ares/inet_net_pton.c b/src/ares/inet_net_pton.c similarity index 100% rename from c-ares/inet_net_pton.c rename to src/ares/inet_net_pton.c diff --git a/c-ares/inet_net_pton.h b/src/ares/inet_net_pton.h similarity index 100% rename from c-ares/inet_net_pton.h rename to src/ares/inet_net_pton.h diff --git a/c-ares/inet_ntop.c b/src/ares/inet_ntop.c similarity index 100% rename from c-ares/inet_ntop.c rename to src/ares/inet_ntop.c diff --git a/c-ares/inet_ntop.h b/src/ares/inet_ntop.h similarity index 100% rename from c-ares/inet_ntop.h rename to src/ares/inet_ntop.h diff --git a/c-ares/nameser.h b/src/ares/nameser.h similarity index 100% rename from c-ares/nameser.h rename to src/ares/nameser.h diff --git a/c-ares/setup_once.h b/src/ares/setup_once.h similarity index 100% rename from c-ares/setup_once.h rename to src/ares/setup_once.h diff --git a/c-ares/windows_port.c b/src/ares/windows_port.c similarity index 100% rename from c-ares/windows_port.c rename to src/ares/windows_port.c diff --git a/eio/Changes b/src/eio/Changes similarity index 100% rename from eio/Changes rename to src/eio/Changes diff --git a/eio/LICENSE b/src/eio/LICENSE similarity index 100% rename from eio/LICENSE rename to src/eio/LICENSE diff --git a/eio/Makefile.am b/src/eio/Makefile.am similarity index 100% rename from eio/Makefile.am rename to src/eio/Makefile.am diff --git a/eio/aclocal.m4 b/src/eio/aclocal.m4 similarity index 100% rename from eio/aclocal.m4 rename to src/eio/aclocal.m4 diff --git a/eio/autogen.sh b/src/eio/autogen.sh similarity index 100% rename from eio/autogen.sh rename to src/eio/autogen.sh diff --git a/eio/config.h.in b/src/eio/config.h.in similarity index 100% rename from eio/config.h.in rename to src/eio/config.h.in diff --git a/eio/config_cygwin.h b/src/eio/config_cygwin.h similarity index 100% rename from eio/config_cygwin.h rename to src/eio/config_cygwin.h diff --git a/eio/config_darwin.h b/src/eio/config_darwin.h similarity index 100% rename from eio/config_darwin.h rename to src/eio/config_darwin.h diff --git a/eio/config_freebsd.h b/src/eio/config_freebsd.h similarity index 100% rename from eio/config_freebsd.h rename to src/eio/config_freebsd.h diff --git a/eio/config_linux.h b/src/eio/config_linux.h similarity index 100% rename from eio/config_linux.h rename to src/eio/config_linux.h diff --git a/eio/config_sunos.h b/src/eio/config_sunos.h similarity index 100% rename from eio/config_sunos.h rename to src/eio/config_sunos.h diff --git a/eio/configure.ac b/src/eio/configure.ac similarity index 100% rename from eio/configure.ac rename to src/eio/configure.ac diff --git a/eio/demo.c b/src/eio/demo.c similarity index 100% rename from eio/demo.c rename to src/eio/demo.c diff --git a/eio/eio.3 b/src/eio/eio.3 similarity index 100% rename from eio/eio.3 rename to src/eio/eio.3 diff --git a/eio/eio.c b/src/eio/eio.c similarity index 100% rename from eio/eio.c rename to src/eio/eio.c diff --git a/eio/eio.pod b/src/eio/eio.pod similarity index 100% rename from eio/eio.pod rename to src/eio/eio.pod diff --git a/eio/libeio.m4 b/src/eio/libeio.m4 similarity index 100% rename from eio/libeio.m4 rename to src/eio/libeio.m4 diff --git a/eio/xthread.h b/src/eio/xthread.h similarity index 100% rename from eio/xthread.h rename to src/eio/xthread.h diff --git a/ev/Changes b/src/ev/Changes similarity index 100% rename from ev/Changes rename to src/ev/Changes diff --git a/ev/LICENSE b/src/ev/LICENSE similarity index 100% rename from ev/LICENSE rename to src/ev/LICENSE diff --git a/ev/Makefile.am b/src/ev/Makefile.am similarity index 100% rename from ev/Makefile.am rename to src/ev/Makefile.am diff --git a/ev/Makefile.in b/src/ev/Makefile.in similarity index 100% rename from ev/Makefile.in rename to src/ev/Makefile.in diff --git a/ev/README b/src/ev/README similarity index 100% rename from ev/README rename to src/ev/README diff --git a/ev/aclocal.m4 b/src/ev/aclocal.m4 similarity index 100% rename from ev/aclocal.m4 rename to src/ev/aclocal.m4 diff --git a/ev/autogen.sh b/src/ev/autogen.sh similarity index 100% rename from ev/autogen.sh rename to src/ev/autogen.sh diff --git a/ev/config.guess b/src/ev/config.guess similarity index 100% rename from ev/config.guess rename to src/ev/config.guess diff --git a/ev/config.h.in b/src/ev/config.h.in similarity index 100% rename from ev/config.h.in rename to src/ev/config.h.in diff --git a/ev/config.sub b/src/ev/config.sub similarity index 100% rename from ev/config.sub rename to src/ev/config.sub diff --git a/ev/config_cygwin.h b/src/ev/config_cygwin.h similarity index 100% rename from ev/config_cygwin.h rename to src/ev/config_cygwin.h diff --git a/ev/config_darwin.h b/src/ev/config_darwin.h similarity index 100% rename from ev/config_darwin.h rename to src/ev/config_darwin.h diff --git a/ev/config_freebsd.h b/src/ev/config_freebsd.h similarity index 100% rename from ev/config_freebsd.h rename to src/ev/config_freebsd.h diff --git a/ev/config_linux.h b/src/ev/config_linux.h similarity index 100% rename from ev/config_linux.h rename to src/ev/config_linux.h diff --git a/ev/config_sunos.h b/src/ev/config_sunos.h similarity index 100% rename from ev/config_sunos.h rename to src/ev/config_sunos.h diff --git a/ev/configure b/src/ev/configure similarity index 100% rename from ev/configure rename to src/ev/configure diff --git a/ev/configure.ac b/src/ev/configure.ac similarity index 100% rename from ev/configure.ac rename to src/ev/configure.ac diff --git a/ev/depcomp b/src/ev/depcomp similarity index 100% rename from ev/depcomp rename to src/ev/depcomp diff --git a/ev/ev++.h b/src/ev/ev++.h similarity index 100% rename from ev/ev++.h rename to src/ev/ev++.h diff --git a/ev/ev.3 b/src/ev/ev.3 similarity index 100% rename from ev/ev.3 rename to src/ev/ev.3 diff --git a/ev/ev.c b/src/ev/ev.c similarity index 100% rename from ev/ev.c rename to src/ev/ev.c diff --git a/ev/ev.h b/src/ev/ev.h similarity index 100% rename from ev/ev.h rename to src/ev/ev.h diff --git a/ev/ev.pod b/src/ev/ev.pod similarity index 100% rename from ev/ev.pod rename to src/ev/ev.pod diff --git a/ev/ev_epoll.c b/src/ev/ev_epoll.c similarity index 100% rename from ev/ev_epoll.c rename to src/ev/ev_epoll.c diff --git a/ev/ev_kqueue.c b/src/ev/ev_kqueue.c similarity index 100% rename from ev/ev_kqueue.c rename to src/ev/ev_kqueue.c diff --git a/ev/ev_poll.c b/src/ev/ev_poll.c similarity index 100% rename from ev/ev_poll.c rename to src/ev/ev_poll.c diff --git a/ev/ev_port.c b/src/ev/ev_port.c similarity index 100% rename from ev/ev_port.c rename to src/ev/ev_port.c diff --git a/ev/ev_select.c b/src/ev/ev_select.c similarity index 100% rename from ev/ev_select.c rename to src/ev/ev_select.c diff --git a/ev/ev_vars.h b/src/ev/ev_vars.h similarity index 100% rename from ev/ev_vars.h rename to src/ev/ev_vars.h diff --git a/ev/ev_win32.c b/src/ev/ev_win32.c similarity index 100% rename from ev/ev_win32.c rename to src/ev/ev_win32.c diff --git a/ev/ev_wrap.h b/src/ev/ev_wrap.h similarity index 100% rename from ev/ev_wrap.h rename to src/ev/ev_wrap.h diff --git a/ev/event.c b/src/ev/event.c similarity index 100% rename from ev/event.c rename to src/ev/event.c diff --git a/ev/event.h b/src/ev/event.h similarity index 100% rename from ev/event.h rename to src/ev/event.h diff --git a/ev/install-sh b/src/ev/install-sh similarity index 100% rename from ev/install-sh rename to src/ev/install-sh diff --git a/ev/libev.m4 b/src/ev/libev.m4 similarity index 100% rename from ev/libev.m4 rename to src/ev/libev.m4 diff --git a/ev/ltmain.sh b/src/ev/ltmain.sh similarity index 100% rename from ev/ltmain.sh rename to src/ev/ltmain.sh diff --git a/ev/missing b/src/ev/missing similarity index 100% rename from ev/missing rename to src/ev/missing diff --git a/ev/mkinstalldirs b/src/ev/mkinstalldirs similarity index 100% rename from ev/mkinstalldirs rename to src/ev/mkinstalldirs diff --git a/uv-common.c b/src/uv-common.c similarity index 99% rename from uv-common.c rename to src/uv-common.c index aeff1598..2c4e0cc7 100644 --- a/uv-common.c +++ b/src/uv-common.c @@ -28,7 +28,7 @@ /* use inet_pton from c-ares if necessary */ #include "ares_config.h" -#include "c-ares/inet_net_pton.h" +#include "ares/inet_net_pton.h" /* list used for ares task handles */ static uv_ares_task_t* uv_ares_handles_ = NULL; diff --git a/uv-common.h b/src/uv-common.h similarity index 100% rename from uv-common.h rename to src/uv-common.h diff --git a/uv-cygwin.c b/src/uv-cygwin.c similarity index 100% rename from uv-cygwin.c rename to src/uv-cygwin.c diff --git a/uv-darwin.c b/src/uv-darwin.c similarity index 100% rename from uv-darwin.c rename to src/uv-darwin.c diff --git a/uv-eio.c b/src/uv-eio.c similarity index 100% rename from uv-eio.c rename to src/uv-eio.c diff --git a/uv-eio.h b/src/uv-eio.h similarity index 100% rename from uv-eio.h rename to src/uv-eio.h diff --git a/uv-freebsd.c b/src/uv-freebsd.c similarity index 100% rename from uv-freebsd.c rename to src/uv-freebsd.c diff --git a/uv-linux.c b/src/uv-linux.c similarity index 100% rename from uv-linux.c rename to src/uv-linux.c diff --git a/uv-sunos.c b/src/uv-sunos.c similarity index 100% rename from uv-sunos.c rename to src/uv-sunos.c diff --git a/uv-unix.c b/src/uv-unix.c similarity index 100% rename from uv-unix.c rename to src/uv-unix.c diff --git a/uv-win.c b/src/uv-win.c similarity index 100% rename from uv-win.c rename to src/uv-win.c diff --git a/test/benchmark-ares.c b/test/benchmark-ares.c index 6766b780..c3f538bf 100644 --- a/test/benchmark-ares.c +++ b/test/benchmark-ares.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" #include diff --git a/test/benchmark-getaddrinfo.c b/test/benchmark-getaddrinfo.c index 3f7a9234..ba859c3c 100644 --- a/test/benchmark-getaddrinfo.c +++ b/test/benchmark-getaddrinfo.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" #include diff --git a/test/benchmark-ping-pongs.c b/test/benchmark-ping-pongs.c index 1df2fcff..7124a361 100644 --- a/test/benchmark-ping-pongs.c +++ b/test/benchmark-ping-pongs.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" #include diff --git a/test/benchmark-pump.c b/test/benchmark-pump.c index 8ba2c37b..cd9c7d99 100644 --- a/test/benchmark-pump.c +++ b/test/benchmark-pump.c @@ -20,7 +20,7 @@ */ #include "task.h" -#include "../uv.h" +#include "uv.h" #include #include diff --git a/test/benchmark-sizes.c b/test/benchmark-sizes.c index e982e681..830de3a0 100644 --- a/test/benchmark-sizes.c +++ b/test/benchmark-sizes.c @@ -20,7 +20,7 @@ */ #include "task.h" -#include "../uv.h" +#include "uv.h" BENCHMARK_IMPL(sizes) { diff --git a/test/dns-server.c b/test/dns-server.c index ec7609cc..361c9d08 100644 --- a/test/dns-server.c +++ b/test/dns-server.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" #include #include diff --git a/test/echo-server.c b/test/echo-server.c index 8486d087..ea01631d 100644 --- a/test/echo-server.c +++ b/test/echo-server.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" #include #include diff --git a/test/test-async.c b/test/test-async.c index 9e3fda1b..a9933fdc 100644 --- a/test/test-async.c +++ b/test/test-async.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" #include #include diff --git a/test/test-bind-error.c b/test/test-bind-error.c index 443c204b..4ac60654 100644 --- a/test/test-bind-error.c +++ b/test/test-bind-error.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" #include #include diff --git a/test/test-bind6-error.c b/test/test-bind6-error.c index 6f6cd8d0..6072dcdc 100644 --- a/test/test-bind6-error.c +++ b/test/test-bind6-error.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" #include #include diff --git a/test/test-callback-stack.c b/test/test-callback-stack.c index 883d4003..286fef39 100644 --- a/test/test-callback-stack.c +++ b/test/test-callback-stack.c @@ -24,7 +24,7 @@ * stack. */ -#include "../uv.h" +#include "uv.h" #include "task.h" diff --git a/test/test-connection-fail.c b/test/test-connection-fail.c index 405d2181..e9120b90 100644 --- a/test/test-connection-fail.c +++ b/test/test-connection-fail.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" #include diff --git a/test/test-delayed-accept.c b/test/test-delayed-accept.c index f0bb6f17..b254ccb0 100644 --- a/test/test-delayed-accept.c +++ b/test/test-delayed-accept.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" #include #include diff --git a/test/test-get-currentexe.c b/test/test-get-currentexe.c index da2c160e..1dc85565 100644 --- a/test/test-get-currentexe.c +++ b/test/test-get-currentexe.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" #include diff --git a/test/test-getaddrinfo.c b/test/test-getaddrinfo.c index f668eec7..a33e3d07 100644 --- a/test/test-getaddrinfo.c +++ b/test/test-getaddrinfo.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" #include diff --git a/test/test-gethostbyname.c b/test/test-gethostbyname.c index 570476d3..cbd25343 100644 --- a/test/test-gethostbyname.c +++ b/test/test-gethostbyname.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" #include diff --git a/test/test-hrtime.c b/test/test-hrtime.c index d7badde7..4d96e333 100644 --- a/test/test-hrtime.c +++ b/test/test-hrtime.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" diff --git a/test/test-loop-handles.c b/test/test-loop-handles.c index a78ef1ec..7979a74b 100644 --- a/test/test-loop-handles.c +++ b/test/test-loop-handles.c @@ -64,7 +64,7 @@ */ -#include "../uv.h" +#include "uv.h" #include "task.h" #include diff --git a/test/test-ping-pong.c b/test/test-ping-pong.c index 14208e75..7004fc60 100644 --- a/test/test-ping-pong.c +++ b/test/test-ping-pong.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" #include diff --git a/test/test-shutdown-eof.c b/test/test-shutdown-eof.c index 3b7febf2..e986a193 100644 --- a/test/test-shutdown-eof.c +++ b/test/test-shutdown-eof.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" #include #include diff --git a/test/test-tcp-writealot.c b/test/test-tcp-writealot.c index 6d9b00f2..b0334899 100644 --- a/test/test-tcp-writealot.c +++ b/test/test-tcp-writealot.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" #include #include diff --git a/test/test-timer-again.c b/test/test-timer-again.c index 00aebd57..e083b01c 100644 --- a/test/test-timer-again.c +++ b/test/test-timer-again.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h" diff --git a/test/test-timer.c b/test/test-timer.c index d9805dd5..c62a8c68 100644 --- a/test/test-timer.c +++ b/test/test-timer.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "../uv.h" +#include "uv.h" #include "task.h"