diff --git a/deps/uv/Makefile b/deps/uv/Makefile index f661299add..5987547522 100644 --- a/deps/uv/Makefile +++ b/deps/uv/Makefile @@ -35,15 +35,15 @@ endif TESTS=test/blackhole-server.c test/echo-server.c test/test-*.c BENCHMARKS=test/blackhole-server.c test/echo-server.c test/dns-server.c test/benchmark-*.c -all: uv.a +all: libuv.a -test/run-tests$(E): test/*.h test/run-tests.c $(RUNNER_SRC) test/runner-unix.c $(TESTS) uv.a +test/run-tests$(E): test/*.h test/run-tests.c $(RUNNER_SRC) test/runner-unix.c $(TESTS) libuv.a $(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) -o test/run-tests test/run-tests.c \ - test/runner.c $(RUNNER_SRC) $(TESTS) uv.a $(RUNNER_LIBS) $(RUNNER_LINKFLAGS) + test/runner.c $(RUNNER_SRC) $(TESTS) libuv.a $(RUNNER_LIBS) $(RUNNER_LINKFLAGS) -test/run-benchmarks$(E): test/*.h test/run-benchmarks.c test/runner.c $(RUNNER_SRC) $(BENCHMARKS) uv.a +test/run-benchmarks$(E): test/*.h test/run-benchmarks.c test/runner.c $(RUNNER_SRC) $(BENCHMARKS) libuv.a $(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) -o test/run-benchmarks test/run-benchmarks.c \ - test/runner.c $(RUNNER_SRC) $(BENCHMARKS) uv.a $(RUNNER_LIBS) $(RUNNER_LINKFLAGS) + test/runner.c $(RUNNER_SRC) $(BENCHMARKS) libuv.a $(RUNNER_LIBS) $(RUNNER_LINKFLAGS) test/echo.o: test/echo.c test/echo.h $(CC) $(CPPFLAGS) $(CFLAGS) -c test/echo.c -o test/echo.o diff --git a/deps/uv/config-mingw.mk b/deps/uv/config-mingw.mk index 0f53407b44..74e934aa1f 100644 --- a/deps/uv/config-mingw.mk +++ b/deps/uv/config-mingw.mk @@ -35,8 +35,8 @@ RUNNER_LINKFLAGS=$(LINKFLAGS) RUNNER_LIBS=-lws2_32 -lpsapi -liphlpapi RUNNER_SRC=test/runner-win.c -uv.a: $(WIN_OBJS) src/fs-poll.o src/inet.o src/uv-common.o - $(AR) rcs uv.a $^ +libuv.a: $(WIN_OBJS) src/fs-poll.o src/inet.o src/uv-common.o + $(AR) rcs $@ $^ src/%.o: src/%.c include/uv.h include/uv-private/uv-win.h $(CC) $(CFLAGS) -c $< -o $@ diff --git a/deps/uv/config-unix.mk b/deps/uv/config-unix.mk index 4269dad378..b619359a77 100644 --- a/deps/uv/config-unix.mk +++ b/deps/uv/config-unix.mk @@ -128,8 +128,8 @@ endif RUNNER_LIBS= RUNNER_SRC=test/runner-unix.c -uv.a: $(OBJS) src/fs-poll.o src/inet.o src/uv-common.o src/unix/ev/ev.o - $(AR) rcs uv.a $^ +libuv.a: $(OBJS) src/fs-poll.o src/inet.o src/uv-common.o src/unix/ev/ev.o + $(AR) rcs $@ $^ src/%.o: src/%.c include/uv.h include/uv-private/uv-unix.h $(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ diff --git a/deps/uv/uv.gyp b/deps/uv/uv.gyp index 9962194db7..0a7f832c51 100644 --- a/deps/uv/uv.gyp +++ b/deps/uv/uv.gyp @@ -22,7 +22,7 @@ 'targets': [ { - 'target_name': 'uv', + 'target_name': 'libuv', 'type': '<(library)', 'include_dirs': [ 'include', @@ -236,7 +236,7 @@ { 'target_name': 'run-tests', 'type': 'executable', - 'dependencies': [ 'uv' ], + 'dependencies': [ 'libuv' ], 'sources': [ 'test/blackhole-server.c', 'test/echo-server.c', @@ -357,7 +357,7 @@ { 'target_name': 'run-benchmarks', 'type': 'executable', - 'dependencies': [ 'uv' ], + 'dependencies': [ 'libuv' ], 'sources': [ 'test/benchmark-async.c', 'test/benchmark-async-pummel.c', diff --git a/node.gyp b/node.gyp index f0fcd3f7df..939870a561 100644 --- a/node.gyp +++ b/node.gyp @@ -59,7 +59,7 @@ 'dependencies': [ 'deps/cares/cares.gyp:cares', 'deps/http_parser/http_parser.gyp:http_parser', - 'deps/uv/uv.gyp:uv', + 'deps/uv/uv.gyp:libuv', 'node_js2c#host', ],