src/ and include/ directories

Helps #71 but does not update the MSVC files.
joyent · Jul 7, 2011 · ce8ff30 · ce8ff30
1 parent 2b2980e
commit ce8ff30
Show file tree

Hide file tree

Showing 184 changed files with 114 additions and 110 deletions.
diff --git 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
@@ -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
@@ -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,39 +31,39 @@ 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
 
 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
 
 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
 
 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
 
 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,43 +75,43 @@ 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)
 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 → doc/desired-api.md b/desired-api.md → doc/desired-api.md
diff --git a/iocp-links.html → doc/iocp-links.html b/iocp-links.html → doc/iocp-links.html
diff --git a/c-ares/ares.h → include/ares.h b/c-ares/ares.h → include/ares.h
diff --git a/c-ares/ares_version.h → include/ares_version.h b/c-ares/ares_version.h → include/ares_version.h
diff --git a/eio/eio.h → include/eio.h b/eio/eio.h → include/eio.h
diff --git a/ngx-queue.h → include/ngx-queue.h b/ngx-queue.h → include/ngx-queue.h
diff --git a/tree.h → include/tree.h b/tree.h → include/tree.h
diff --git a/uv-unix.h → include/uv-unix.h b/uv-unix.h → include/uv-unix.h
@@ -24,7 +24,7 @@
 
 #include "ngx-queue.h"
 
-#include "ev/ev.h"
+#include "ev.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>

diff --git a/uv-win.h → include/uv-win.h b/uv-win.h → include/uv-win.h
diff --git a/uv.h → include/uv.h b/uv.h → include/uv.h
@@ -33,7 +33,7 @@ extern "C" {
 #include <stdint.h> /* int64_t */
 #include <sys/types.h> /* size_t */
 
-#include "c-ares/ares.h"
+#include "ares.h"
 
 #ifndef _SSIZE_T_
 typedef intptr_t ssize_t;

diff --git a/c-ares/AUTHORS → src/ares/AUTHORS b/c-ares/AUTHORS → src/ares/AUTHORS
diff --git a/c-ares/CHANGES → src/ares/CHANGES b/c-ares/CHANGES → src/ares/CHANGES
diff --git a/c-ares/CMakeLists.txt → src/ares/CMakeLists.txt b/c-ares/CMakeLists.txt → src/ares/CMakeLists.txt
diff --git a/c-ares/NEWS → src/ares/NEWS b/c-ares/NEWS → src/ares/NEWS
diff --git a/c-ares/README → src/ares/README b/c-ares/README → src/ares/README
diff --git a/c-ares/README.cares → src/ares/README.cares b/c-ares/README.cares → src/ares/README.cares
diff --git a/c-ares/README.msvc → src/ares/README.msvc b/c-ares/README.msvc → src/ares/README.msvc
diff --git a/c-ares/README.node → src/ares/README.node b/c-ares/README.node → src/ares/README.node
diff --git a/c-ares/RELEASE-NOTES → src/ares/RELEASE-NOTES b/c-ares/RELEASE-NOTES → src/ares/RELEASE-NOTES
diff --git a/c-ares/TODO → src/ares/TODO b/c-ares/TODO → src/ares/TODO
diff --git a/c-ares/ares__close_sockets.c → src/ares/ares__close_sockets.c b/c-ares/ares__close_sockets.c → src/ares/ares__close_sockets.c
diff --git a/c-ares/ares__get_hostent.c → src/ares/ares__get_hostent.c b/c-ares/ares__get_hostent.c → src/ares/ares__get_hostent.c
diff --git a/c-ares/ares__read_line.c → src/ares/ares__read_line.c b/c-ares/ares__read_line.c → src/ares/ares__read_line.c
diff --git a/c-ares/ares__timeval.c → src/ares/ares__timeval.c b/c-ares/ares__timeval.c → src/ares/ares__timeval.c
diff --git a/c-ares/ares_cancel.c → src/ares/ares_cancel.c b/c-ares/ares_cancel.c → src/ares/ares_cancel.c
diff --git a/c-ares/ares_data.c → src/ares/ares_data.c b/c-ares/ares_data.c → src/ares/ares_data.c
diff --git a/c-ares/ares_data.h → src/ares/ares_data.h b/c-ares/ares_data.h → src/ares/ares_data.h
diff --git a/c-ares/ares_destroy.c → src/ares/ares_destroy.c b/c-ares/ares_destroy.c → src/ares/ares_destroy.c
diff --git a/c-ares/ares_dns.h → src/ares/ares_dns.h b/c-ares/ares_dns.h → src/ares/ares_dns.h
diff --git a/c-ares/ares_expand_name.c → src/ares/ares_expand_name.c b/c-ares/ares_expand_name.c → src/ares/ares_expand_name.c
diff --git a/c-ares/ares_expand_string.c → src/ares/ares_expand_string.c b/c-ares/ares_expand_string.c → src/ares/ares_expand_string.c
diff --git a/c-ares/ares_fds.c → src/ares/ares_fds.c b/c-ares/ares_fds.c → src/ares/ares_fds.c
diff --git a/c-ares/ares_free_hostent.c → src/ares/ares_free_hostent.c b/c-ares/ares_free_hostent.c → src/ares/ares_free_hostent.c
diff --git a/c-ares/ares_free_string.c → src/ares/ares_free_string.c b/c-ares/ares_free_string.c → src/ares/ares_free_string.c
diff --git a/c-ares/ares_gethostbyaddr.c → src/ares/ares_gethostbyaddr.c b/c-ares/ares_gethostbyaddr.c → src/ares/ares_gethostbyaddr.c
diff --git a/c-ares/ares_gethostbyname.c → src/ares/ares_gethostbyname.c b/c-ares/ares_gethostbyname.c → src/ares/ares_gethostbyname.c
diff --git a/c-ares/ares_getnameinfo.c → src/ares/ares_getnameinfo.c b/c-ares/ares_getnameinfo.c → src/ares/ares_getnameinfo.c
diff --git a/c-ares/ares_getopt.c → src/ares/ares_getopt.c b/c-ares/ares_getopt.c → src/ares/ares_getopt.c
diff --git a/c-ares/ares_getopt.h → src/ares/ares_getopt.h b/c-ares/ares_getopt.h → src/ares/ares_getopt.h
diff --git a/c-ares/ares_getsock.c → src/ares/ares_getsock.c b/c-ares/ares_getsock.c → src/ares/ares_getsock.c
diff --git a/c-ares/ares_init.c → src/ares/ares_init.c b/c-ares/ares_init.c → src/ares/ares_init.c
diff --git a/c-ares/ares_ipv6.h → src/ares/ares_ipv6.h b/c-ares/ares_ipv6.h → src/ares/ares_ipv6.h
diff --git a/c-ares/ares_library_init.c → src/ares/ares_library_init.c b/c-ares/ares_library_init.c → src/ares/ares_library_init.c
diff --git a/c-ares/ares_library_init.h → src/ares/ares_library_init.h b/c-ares/ares_library_init.h → src/ares/ares_library_init.h
diff --git a/c-ares/ares_llist.c → src/ares/ares_llist.c b/c-ares/ares_llist.c → src/ares/ares_llist.c
diff --git a/c-ares/ares_llist.h → src/ares/ares_llist.h b/c-ares/ares_llist.h → src/ares/ares_llist.h
diff --git a/c-ares/ares_mkquery.c → src/ares/ares_mkquery.c b/c-ares/ares_mkquery.c → src/ares/ares_mkquery.c
diff --git a/c-ares/ares_nowarn.c → src/ares/ares_nowarn.c b/c-ares/ares_nowarn.c → src/ares/ares_nowarn.c
diff --git a/c-ares/ares_nowarn.h → src/ares/ares_nowarn.h b/c-ares/ares_nowarn.h → src/ares/ares_nowarn.h
diff --git a/c-ares/ares_options.c → src/ares/ares_options.c b/c-ares/ares_options.c → src/ares/ares_options.c
diff --git a/c-ares/ares_parse_a_reply.c → src/ares/ares_parse_a_reply.c b/c-ares/ares_parse_a_reply.c → src/ares/ares_parse_a_reply.c
diff --git a/c-ares/ares_parse_aaaa_reply.c → src/ares/ares_parse_aaaa_reply.c b/c-ares/ares_parse_aaaa_reply.c → src/ares/ares_parse_aaaa_reply.c
diff --git a/c-ares/ares_parse_mx_reply.c → src/ares/ares_parse_mx_reply.c b/c-ares/ares_parse_mx_reply.c → src/ares/ares_parse_mx_reply.c
diff --git a/c-ares/ares_parse_ns_reply.c → src/ares/ares_parse_ns_reply.c b/c-ares/ares_parse_ns_reply.c → src/ares/ares_parse_ns_reply.c
diff --git a/c-ares/ares_parse_ptr_reply.c → src/ares/ares_parse_ptr_reply.c b/c-ares/ares_parse_ptr_reply.c → src/ares/ares_parse_ptr_reply.c
diff --git a/c-ares/ares_parse_srv_reply.c → src/ares/ares_parse_srv_reply.c b/c-ares/ares_parse_srv_reply.c → src/ares/ares_parse_srv_reply.c
diff --git a/c-ares/ares_parse_txt_reply.c → src/ares/ares_parse_txt_reply.c b/c-ares/ares_parse_txt_reply.c → src/ares/ares_parse_txt_reply.c
diff --git a/c-ares/ares_private.h → src/ares/ares_private.h b/c-ares/ares_private.h → src/ares/ares_private.h
diff --git a/c-ares/ares_process.c → src/ares/ares_process.c b/c-ares/ares_process.c → src/ares/ares_process.c
diff --git a/c-ares/ares_query.c → src/ares/ares_query.c b/c-ares/ares_query.c → src/ares/ares_query.c
diff --git a/c-ares/ares_rules.h → src/ares/ares_rules.h b/c-ares/ares_rules.h → src/ares/ares_rules.h
diff --git a/c-ares/ares_search.c → src/ares/ares_search.c b/c-ares/ares_search.c → src/ares/ares_search.c
diff --git a/c-ares/ares_send.c → src/ares/ares_send.c b/c-ares/ares_send.c → src/ares/ares_send.c
diff --git a/c-ares/ares_setup.h → src/ares/ares_setup.h b/c-ares/ares_setup.h → src/ares/ares_setup.h
diff --git a/c-ares/ares_strcasecmp.c → src/ares/ares_strcasecmp.c b/c-ares/ares_strcasecmp.c → src/ares/ares_strcasecmp.c
diff --git a/c-ares/ares_strcasecmp.h → src/ares/ares_strcasecmp.h b/c-ares/ares_strcasecmp.h → src/ares/ares_strcasecmp.h
diff --git a/c-ares/ares_strdup.c → src/ares/ares_strdup.c b/c-ares/ares_strdup.c → src/ares/ares_strdup.c
diff --git a/c-ares/ares_strdup.h → src/ares/ares_strdup.h b/c-ares/ares_strdup.h → src/ares/ares_strdup.h
diff --git a/c-ares/ares_strerror.c → src/ares/ares_strerror.c b/c-ares/ares_strerror.c → src/ares/ares_strerror.c
diff --git a/c-ares/ares_timeout.c → src/ares/ares_timeout.c b/c-ares/ares_timeout.c → src/ares/ares_timeout.c
diff --git a/c-ares/ares_version.c → src/ares/ares_version.c b/c-ares/ares_version.c → src/ares/ares_version.c
diff --git a/c-ares/ares_writev.c → src/ares/ares_writev.c b/c-ares/ares_writev.c → src/ares/ares_writev.c
diff --git a/c-ares/ares_writev.h → src/ares/ares_writev.h b/c-ares/ares_writev.h → src/ares/ares_writev.h
diff --git a/c-ares/bitncmp.c → src/ares/bitncmp.c b/c-ares/bitncmp.c → src/ares/bitncmp.c
diff --git a/c-ares/bitncmp.h → src/ares/bitncmp.h b/c-ares/bitncmp.h → src/ares/bitncmp.h
diff --git a/c-ares/config-win32.h → src/ares/config-win32.h b/c-ares/config-win32.h → src/ares/config-win32.h
diff --git a/c-ares/config_cygwin/ares_config.h → src/ares/config_cygwin/ares_config.h b/c-ares/config_cygwin/ares_config.h → src/ares/config_cygwin/ares_config.h
diff --git a/c-ares/config_darwin/ares_config.h → src/ares/config_darwin/ares_config.h b/c-ares/config_darwin/ares_config.h → src/ares/config_darwin/ares_config.h
diff --git a/c-ares/config_freebsd/ares_config.h → src/ares/config_freebsd/ares_config.h b/c-ares/config_freebsd/ares_config.h → src/ares/config_freebsd/ares_config.h
diff --git a/c-ares/config_linux/ares_config.h → src/ares/config_linux/ares_config.h b/c-ares/config_linux/ares_config.h → src/ares/config_linux/ares_config.h
diff --git a/c-ares/config_openbsd/ares_config.h → src/ares/config_openbsd/ares_config.h b/c-ares/config_openbsd/ares_config.h → src/ares/config_openbsd/ares_config.h
diff --git a/c-ares/config_sunos/ares_config.h → src/ares/config_sunos/ares_config.h b/c-ares/config_sunos/ares_config.h → src/ares/config_sunos/ares_config.h
diff --git a/c-ares/config_win32/ares_config.h → src/ares/config_win32/ares_config.h b/c-ares/config_win32/ares_config.h → src/ares/config_win32/ares_config.h
diff --git a/c-ares/get_ver.awk → src/ares/get_ver.awk b/c-ares/get_ver.awk → src/ares/get_ver.awk
diff --git a/c-ares/inet_net_pton.c → src/ares/inet_net_pton.c b/c-ares/inet_net_pton.c → src/ares/inet_net_pton.c
diff --git a/c-ares/inet_net_pton.h → src/ares/inet_net_pton.h b/c-ares/inet_net_pton.h → src/ares/inet_net_pton.h
diff --git a/c-ares/inet_ntop.c → src/ares/inet_ntop.c b/c-ares/inet_ntop.c → src/ares/inet_ntop.c
diff --git a/c-ares/inet_ntop.h → src/ares/inet_ntop.h b/c-ares/inet_ntop.h → src/ares/inet_ntop.h
diff --git a/c-ares/nameser.h → src/ares/nameser.h b/c-ares/nameser.h → src/ares/nameser.h
diff --git a/c-ares/setup_once.h → src/ares/setup_once.h b/c-ares/setup_once.h → src/ares/setup_once.h
diff --git a/c-ares/windows_port.c → src/ares/windows_port.c b/c-ares/windows_port.c → src/ares/windows_port.c
diff --git a/eio/Changes → src/eio/Changes b/eio/Changes → src/eio/Changes
diff --git a/eio/LICENSE → src/eio/LICENSE b/eio/LICENSE → src/eio/LICENSE
diff --git a/eio/Makefile.am → src/eio/Makefile.am b/eio/Makefile.am → src/eio/Makefile.am
diff --git a/eio/aclocal.m4 → src/eio/aclocal.m4 b/eio/aclocal.m4 → src/eio/aclocal.m4
diff --git a/eio/autogen.sh → src/eio/autogen.sh b/eio/autogen.sh → src/eio/autogen.sh
diff --git a/eio/config.h.in → src/eio/config.h.in b/eio/config.h.in → src/eio/config.h.in
diff --git a/eio/config_cygwin.h → src/eio/config_cygwin.h b/eio/config_cygwin.h → src/eio/config_cygwin.h
diff --git a/eio/config_darwin.h → src/eio/config_darwin.h b/eio/config_darwin.h → src/eio/config_darwin.h
diff --git a/eio/config_freebsd.h → src/eio/config_freebsd.h b/eio/config_freebsd.h → src/eio/config_freebsd.h
diff --git a/eio/config_linux.h → src/eio/config_linux.h b/eio/config_linux.h → src/eio/config_linux.h
diff --git a/eio/config_sunos.h → src/eio/config_sunos.h b/eio/config_sunos.h → src/eio/config_sunos.h
diff --git a/eio/configure.ac → src/eio/configure.ac b/eio/configure.ac → src/eio/configure.ac
diff --git a/eio/demo.c → src/eio/demo.c b/eio/demo.c → src/eio/demo.c
diff --git a/eio/eio.3 → src/eio/eio.3 b/eio/eio.3 → src/eio/eio.3
diff --git a/eio/eio.c → src/eio/eio.c b/eio/eio.c → src/eio/eio.c
diff --git a/eio/eio.pod → src/eio/eio.pod b/eio/eio.pod → src/eio/eio.pod
diff --git a/eio/libeio.m4 → src/eio/libeio.m4 b/eio/libeio.m4 → src/eio/libeio.m4
diff --git a/eio/xthread.h → src/eio/xthread.h b/eio/xthread.h → src/eio/xthread.h
diff --git a/ev/Changes → src/ev/Changes b/ev/Changes → src/ev/Changes
diff --git a/ev/LICENSE → src/ev/LICENSE b/ev/LICENSE → src/ev/LICENSE
diff --git a/ev/Makefile.am → src/ev/Makefile.am b/ev/Makefile.am → src/ev/Makefile.am
diff --git a/ev/Makefile.in → src/ev/Makefile.in b/ev/Makefile.in → src/ev/Makefile.in
diff --git a/ev/README → src/ev/README b/ev/README → src/ev/README
diff --git a/ev/aclocal.m4 → src/ev/aclocal.m4 b/ev/aclocal.m4 → src/ev/aclocal.m4
diff --git a/ev/autogen.sh → src/ev/autogen.sh b/ev/autogen.sh → src/ev/autogen.sh
diff --git a/ev/config.guess → src/ev/config.guess b/ev/config.guess → src/ev/config.guess
diff --git a/ev/config.h.in → src/ev/config.h.in b/ev/config.h.in → src/ev/config.h.in
diff --git a/ev/config.sub → src/ev/config.sub b/ev/config.sub → src/ev/config.sub
diff --git a/ev/config_cygwin.h → src/ev/config_cygwin.h b/ev/config_cygwin.h → src/ev/config_cygwin.h
diff --git a/ev/config_darwin.h → src/ev/config_darwin.h b/ev/config_darwin.h → src/ev/config_darwin.h
diff --git a/ev/config_freebsd.h → src/ev/config_freebsd.h b/ev/config_freebsd.h → src/ev/config_freebsd.h
diff --git a/ev/config_linux.h → src/ev/config_linux.h b/ev/config_linux.h → src/ev/config_linux.h
diff --git a/ev/config_sunos.h → src/ev/config_sunos.h b/ev/config_sunos.h → src/ev/config_sunos.h
diff --git a/ev/configure → src/ev/configure b/ev/configure → src/ev/configure
diff --git a/ev/configure.ac → src/ev/configure.ac b/ev/configure.ac → src/ev/configure.ac
diff --git a/ev/depcomp → src/ev/depcomp b/ev/depcomp → src/ev/depcomp
diff --git a/ev/ev++.h → src/ev/ev++.h b/ev/ev++.h → src/ev/ev++.h
diff --git a/ev/ev.3 → src/ev/ev.3 b/ev/ev.3 → src/ev/ev.3
diff --git a/ev/ev.c → src/ev/ev.c b/ev/ev.c → src/ev/ev.c
diff --git a/ev/ev.h → src/ev/ev.h b/ev/ev.h → src/ev/ev.h
diff --git a/ev/ev.pod → src/ev/ev.pod b/ev/ev.pod → src/ev/ev.pod
diff --git a/ev/ev_epoll.c → src/ev/ev_epoll.c b/ev/ev_epoll.c → src/ev/ev_epoll.c
diff --git a/ev/ev_kqueue.c → src/ev/ev_kqueue.c b/ev/ev_kqueue.c → src/ev/ev_kqueue.c
diff --git a/ev/ev_poll.c → src/ev/ev_poll.c b/ev/ev_poll.c → src/ev/ev_poll.c
diff --git a/ev/ev_port.c → src/ev/ev_port.c b/ev/ev_port.c → src/ev/ev_port.c
diff --git a/ev/ev_select.c → src/ev/ev_select.c b/ev/ev_select.c → src/ev/ev_select.c
diff --git a/ev/ev_vars.h → src/ev/ev_vars.h b/ev/ev_vars.h → src/ev/ev_vars.h
diff --git a/ev/ev_win32.c → src/ev/ev_win32.c b/ev/ev_win32.c → src/ev/ev_win32.c
diff --git a/ev/ev_wrap.h → src/ev/ev_wrap.h b/ev/ev_wrap.h → src/ev/ev_wrap.h
diff --git a/ev/event.c → src/ev/event.c b/ev/event.c → src/ev/event.c
diff --git a/ev/event.h → src/ev/event.h b/ev/event.h → src/ev/event.h
diff --git a/ev/install-sh → src/ev/install-sh b/ev/install-sh → src/ev/install-sh
diff --git a/ev/libev.m4 → src/ev/libev.m4 b/ev/libev.m4 → src/ev/libev.m4
diff --git a/ev/ltmain.sh → src/ev/ltmain.sh b/ev/ltmain.sh → src/ev/ltmain.sh
diff --git a/ev/missing → src/ev/missing b/ev/missing → src/ev/missing
diff --git a/ev/mkinstalldirs → src/ev/mkinstalldirs b/ev/mkinstalldirs → src/ev/mkinstalldirs
diff --git a/uv-common.c → src/uv-common.c b/uv-common.c → 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 → src/uv-common.h b/uv-common.h → src/uv-common.h
diff --git a/uv-cygwin.c → src/uv-cygwin.c b/uv-cygwin.c → src/uv-cygwin.c
diff --git a/uv-darwin.c → src/uv-darwin.c b/uv-darwin.c → src/uv-darwin.c
diff --git a/uv-eio.c → src/uv-eio.c b/uv-eio.c → src/uv-eio.c
diff --git a/uv-eio.h → src/uv-eio.h b/uv-eio.h → src/uv-eio.h
diff --git a/uv-freebsd.c → src/uv-freebsd.c b/uv-freebsd.c → src/uv-freebsd.c
diff --git a/uv-linux.c → src/uv-linux.c b/uv-linux.c → src/uv-linux.c
diff --git a/uv-sunos.c → src/uv-sunos.c b/uv-sunos.c → src/uv-sunos.c
diff --git a/uv-unix.c → src/uv-unix.c b/uv-unix.c → src/uv-unix.c
diff --git a/uv-win.c → src/uv-win.c b/uv-win.c → src/uv-win.c
diff --git 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 <stdlib.h>

diff --git 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 <stdlib.h>

diff --git 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 <stdlib.h>

diff --git a/test/benchmark-pump.c b/test/benchmark-pump.c
@@ -20,7 +20,7 @@
  */
 
 #include "task.h"
-#include "../uv.h"
+#include "uv.h"
 
 #include <math.h>
 #include <stdio.h>

diff --git 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
@@ -19,7 +19,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "../uv.h"
+#include "uv.h"
 #include "task.h"
 #include <stdio.h>
 #include <stdlib.h>

diff --git 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 <stdio.h>
 #include <stdlib.h>

diff --git 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 <stdio.h>
 #include <stdlib.h>

diff --git 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 <stdio.h>
 #include <stdlib.h>

diff --git 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 <stdio.h>
 #include <stdlib.h>

diff --git 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"