Permalink
Browse files

src/ and include/ directories

Helps #71 but does not update the MSVC files.
  • Loading branch information...
ry committed Jul 6, 2011
1 parent 2b2980e commit ce8ff3031c36b069e1da42b0f3bf0373ca42f2a6
Showing with 114 additions and 110 deletions.
  1. +45 −44 Makefile
  2. +16 −14 config-mingw.mk
  3. +27 −26 config-unix.mk
  4. 0 { → doc}/desired-api.md
  5. 0 { → doc}/iocp-links.html
  6. 0 {c-ares → include}/ares.h
  7. 0 {c-ares → include}/ares_version.h
  8. 0 {eio → include}/eio.h
  9. 0 { → include}/ngx-queue.h
  10. 0 { → include}/tree.h
  11. +1 −1 { → include}/uv-unix.h
  12. 0 { → include}/uv-win.h
  13. +1 −1 { → include}/uv.h
  14. 0 {c-ares → src/ares}/AUTHORS
  15. 0 {c-ares → src/ares}/CHANGES
  16. 0 {c-ares → src/ares}/CMakeLists.txt
  17. 0 {c-ares → src/ares}/NEWS
  18. 0 {c-ares → src/ares}/README
  19. 0 {c-ares → src/ares}/README.cares
  20. 0 {c-ares → src/ares}/README.msvc
  21. 0 {c-ares → src/ares}/README.node
  22. 0 {c-ares → src/ares}/RELEASE-NOTES
  23. 0 {c-ares → src/ares}/TODO
  24. 0 {c-ares → src/ares}/ares__close_sockets.c
  25. 0 {c-ares → src/ares}/ares__get_hostent.c
  26. 0 {c-ares → src/ares}/ares__read_line.c
  27. 0 {c-ares → src/ares}/ares__timeval.c
  28. 0 {c-ares → src/ares}/ares_cancel.c
  29. 0 {c-ares → src/ares}/ares_data.c
  30. 0 {c-ares → src/ares}/ares_data.h
  31. 0 {c-ares → src/ares}/ares_destroy.c
  32. 0 {c-ares → src/ares}/ares_dns.h
  33. 0 {c-ares → src/ares}/ares_expand_name.c
  34. 0 {c-ares → src/ares}/ares_expand_string.c
  35. 0 {c-ares → src/ares}/ares_fds.c
  36. 0 {c-ares → src/ares}/ares_free_hostent.c
  37. 0 {c-ares → src/ares}/ares_free_string.c
  38. 0 {c-ares → src/ares}/ares_gethostbyaddr.c
  39. 0 {c-ares → src/ares}/ares_gethostbyname.c
  40. 0 {c-ares → src/ares}/ares_getnameinfo.c
  41. 0 {c-ares → src/ares}/ares_getopt.c
  42. 0 {c-ares → src/ares}/ares_getopt.h
  43. 0 {c-ares → src/ares}/ares_getsock.c
  44. 0 {c-ares → src/ares}/ares_init.c
  45. 0 {c-ares → src/ares}/ares_ipv6.h
  46. 0 {c-ares → src/ares}/ares_library_init.c
  47. 0 {c-ares → src/ares}/ares_library_init.h
  48. 0 {c-ares → src/ares}/ares_llist.c
  49. 0 {c-ares → src/ares}/ares_llist.h
  50. 0 {c-ares → src/ares}/ares_mkquery.c
  51. 0 {c-ares → src/ares}/ares_nowarn.c
  52. 0 {c-ares → src/ares}/ares_nowarn.h
  53. 0 {c-ares → src/ares}/ares_options.c
  54. 0 {c-ares → src/ares}/ares_parse_a_reply.c
  55. 0 {c-ares → src/ares}/ares_parse_aaaa_reply.c
  56. 0 {c-ares → src/ares}/ares_parse_mx_reply.c
  57. 0 {c-ares → src/ares}/ares_parse_ns_reply.c
  58. 0 {c-ares → src/ares}/ares_parse_ptr_reply.c
  59. 0 {c-ares → src/ares}/ares_parse_srv_reply.c
  60. 0 {c-ares → src/ares}/ares_parse_txt_reply.c
  61. 0 {c-ares → src/ares}/ares_private.h
  62. 0 {c-ares → src/ares}/ares_process.c
  63. 0 {c-ares → src/ares}/ares_query.c
  64. 0 {c-ares → src/ares}/ares_rules.h
  65. 0 {c-ares → src/ares}/ares_search.c
  66. 0 {c-ares → src/ares}/ares_send.c
  67. 0 {c-ares → src/ares}/ares_setup.h
  68. 0 {c-ares → src/ares}/ares_strcasecmp.c
  69. 0 {c-ares → src/ares}/ares_strcasecmp.h
  70. 0 {c-ares → src/ares}/ares_strdup.c
  71. 0 {c-ares → src/ares}/ares_strdup.h
  72. 0 {c-ares → src/ares}/ares_strerror.c
  73. 0 {c-ares → src/ares}/ares_timeout.c
  74. 0 {c-ares → src/ares}/ares_version.c
  75. 0 {c-ares → src/ares}/ares_writev.c
  76. 0 {c-ares → src/ares}/ares_writev.h
  77. 0 {c-ares → src/ares}/bitncmp.c
  78. 0 {c-ares → src/ares}/bitncmp.h
  79. 0 {c-ares → src/ares}/config-win32.h
  80. 0 {c-ares → src/ares}/config_cygwin/ares_config.h
  81. 0 {c-ares → src/ares}/config_darwin/ares_config.h
  82. 0 {c-ares → src/ares}/config_freebsd/ares_config.h
  83. 0 {c-ares → src/ares}/config_linux/ares_config.h
  84. 0 {c-ares → src/ares}/config_openbsd/ares_config.h
  85. 0 {c-ares → src/ares}/config_sunos/ares_config.h
  86. 0 {c-ares → src/ares}/config_win32/ares_config.h
  87. 0 {c-ares → src/ares}/get_ver.awk
  88. 0 {c-ares → src/ares}/inet_net_pton.c
  89. 0 {c-ares → src/ares}/inet_net_pton.h
  90. 0 {c-ares → src/ares}/inet_ntop.c
  91. 0 {c-ares → src/ares}/inet_ntop.h
  92. 0 {c-ares → src/ares}/nameser.h
  93. 0 {c-ares → src/ares}/setup_once.h
  94. 0 {c-ares → src/ares}/windows_port.c
  95. 0 { → src}/eio/Changes
  96. 0 { → src}/eio/LICENSE
  97. 0 { → src}/eio/Makefile.am
  98. 0 { → src}/eio/aclocal.m4
  99. 0 { → src}/eio/autogen.sh
  100. 0 { → src}/eio/config.h.in
  101. 0 { → src}/eio/config_cygwin.h
  102. 0 { → src}/eio/config_darwin.h
  103. 0 { → src}/eio/config_freebsd.h
  104. 0 { → src}/eio/config_linux.h
  105. 0 { → src}/eio/config_sunos.h
  106. 0 { → src}/eio/configure.ac
  107. 0 { → src}/eio/demo.c
  108. 0 { → src}/eio/eio.3
  109. 0 { → src}/eio/eio.c
  110. 0 { → src}/eio/eio.pod
  111. 0 { → src}/eio/libeio.m4
  112. 0 { → src}/eio/xthread.h
  113. 0 { → src}/ev/Changes
  114. 0 { → src}/ev/LICENSE
  115. 0 { → src}/ev/Makefile.am
  116. 0 { → src}/ev/Makefile.in
  117. 0 { → src}/ev/README
  118. 0 { → src}/ev/aclocal.m4
  119. 0 { → src}/ev/autogen.sh
  120. 0 { → src}/ev/config.guess
  121. 0 { → src}/ev/config.h.in
  122. 0 { → src}/ev/config.sub
  123. 0 { → src}/ev/config_cygwin.h
  124. 0 { → src}/ev/config_darwin.h
  125. 0 { → src}/ev/config_freebsd.h
  126. 0 { → src}/ev/config_linux.h
  127. 0 { → src}/ev/config_sunos.h
  128. 0 { → src}/ev/configure
  129. 0 { → src}/ev/configure.ac
  130. 0 { → src}/ev/depcomp
  131. 0 { → src}/ev/ev++.h
  132. 0 { → src}/ev/ev.3
  133. 0 { → src}/ev/ev.c
  134. 0 { → src}/ev/ev.h
  135. 0 { → src}/ev/ev.pod
  136. 0 { → src}/ev/ev_epoll.c
  137. 0 { → src}/ev/ev_kqueue.c
  138. 0 { → src}/ev/ev_poll.c
  139. 0 { → src}/ev/ev_port.c
  140. 0 { → src}/ev/ev_select.c
  141. 0 { → src}/ev/ev_vars.h
  142. 0 { → src}/ev/ev_win32.c
  143. 0 { → src}/ev/ev_wrap.h
  144. 0 { → src}/ev/event.c
  145. 0 { → src}/ev/event.h
  146. 0 { → src}/ev/install-sh
  147. 0 { → src}/ev/libev.m4
  148. 0 { → src}/ev/ltmain.sh
  149. 0 { → src}/ev/missing
  150. 0 { → src}/ev/mkinstalldirs
  151. +1 −1 { → src}/uv-common.c
  152. 0 { → src}/uv-common.h
  153. 0 { → src}/uv-cygwin.c
  154. 0 { → src}/uv-darwin.c
  155. 0 { → src}/uv-eio.c
  156. 0 { → src}/uv-eio.h
  157. 0 { → src}/uv-freebsd.c
  158. 0 { → src}/uv-linux.c
  159. 0 { → src}/uv-sunos.c
  160. 0 { → src}/uv-unix.c
  161. 0 { → src}/uv-win.c
  162. +1 −1 test/benchmark-ares.c
  163. +1 −1 test/benchmark-getaddrinfo.c
  164. +1 −1 test/benchmark-ping-pongs.c
  165. +1 −1 test/benchmark-pump.c
  166. +1 −1 test/benchmark-sizes.c
  167. +1 −1 test/dns-server.c
  168. +1 −1 test/echo-server.c
  169. +1 −1 test/test-async.c
  170. +1 −1 test/test-bind-error.c
  171. +1 −1 test/test-bind6-error.c
  172. +1 −1 test/test-callback-stack.c
  173. +1 −1 test/test-connection-fail.c
  174. +1 −1 test/test-delayed-accept.c
  175. +1 −1 test/test-get-currentexe.c
  176. +1 −1 test/test-getaddrinfo.c
  177. +1 −1 test/test-gethostbyname.c
  178. +1 −1 test/test-hrtime.c
  179. +1 −1 test/test-loop-handles.c
  180. +1 −1 test/test-ping-pong.c
  181. +1 −1 test/test-shutdown-eof.c
  182. +1 −1 test/test-tcp-writealot.c
  183. +1 −1 test/test-timer-again.c
  184. +1 −1 test/test-timer.c
View
@@ -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
View
@@ -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
View
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -24,7 +24,7 @@
#include "ngx-queue.h"
-#include "ev/ev.h"
+#include "ev.h"
#include <sys/types.h>
#include <sys/socket.h>
File renamed without changes.
View
@@ -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;
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
File renamed without changes.
View
File renamed without changes.
View
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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;
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -19,7 +19,7 @@
* IN THE SOFTWARE.
*/
-#include "../uv.h"
+#include "uv.h"
#include "task.h"
#include <stdlib.h>
@@ -19,7 +19,7 @@
* IN THE SOFTWARE.
*/
-#include "../uv.h"
+#include "uv.h"
#include "task.h"
#include <stdlib.h>
@@ -19,7 +19,7 @@
* IN THE SOFTWARE.
*/
-#include "../uv.h"
+#include "uv.h"
#include "task.h"
#include <stdlib.h>
View
@@ -20,7 +20,7 @@
*/
#include "task.h"
-#include "../uv.h"
+#include "uv.h"
#include <math.h>
#include <stdio.h>
View
@@ -20,7 +20,7 @@
*/
#include "task.h"
-#include "../uv.h"
+#include "uv.h"
BENCHMARK_IMPL(sizes) {
View
@@ -19,7 +19,7 @@
* IN THE SOFTWARE.
*/
-#include "../uv.h"
+#include "uv.h"
#include "task.h"
#include <stdio.h>
#include <stdlib.h>
View
@@ -19,7 +19,7 @@
* IN THE SOFTWARE.
*/
-#include "../uv.h"
+#include "uv.h"
#include "task.h"
#include <stdio.h>
#include <stdlib.h>
View
@@ -19,7 +19,7 @@
* IN THE SOFTWARE.
*/
-#include "../uv.h"
+#include "uv.h"
#include "task.h"
#include <stdio.h>
#include <stdlib.h>
View
@@ -19,7 +19,7 @@
* IN THE SOFTWARE.
*/
-#include "../uv.h"
+#include "uv.h"
#include "task.h"
#include <stdio.h>
#include <stdlib.h>
View
@@ -19,7 +19,7 @@
* IN THE SOFTWARE.
*/
-#include "../uv.h"
+#include "uv.h"
#include "task.h"
#include <stdio.h>
#include <stdlib.h>
@@ -24,7 +24,7 @@
* stack.
*/
-#include "../uv.h"
+#include "uv.h"
#include "task.h"
Oops, something went wrong.

0 comments on commit ce8ff30

Please sign in to comment.