Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Makefile munging

Add EV_MULTIPLICITY=0 (until we add threads)
  • Loading branch information...
commit d85168b2994e02c24c6b0a09b23c0dbe590767a1 1 parent d2653df
@ry ry authored
Showing with 7 additions and 6 deletions.
  1. +3 −0  Makefile
  2. +0 −2  config-mingw.mk
  3. +4 −4 config-unix.mk
View
3  Makefile
@@ -26,6 +26,9 @@ else
include config-unix.mk
endif
+TESTS=test/echo-server.c test/test-*.c
+BENCHMARKS=test/echo-server.c test/benchmark-*.c
+
all: uv.a test/run-tests test/run-benchmarks
test/run-tests$(E): test/*.h test/run-tests.c $(RUNNER_SRC) test/runner-unix.c $(TESTS) uv.a
View
2  config-mingw.mk
@@ -26,8 +26,6 @@ E=.exe
CFLAGS=-g --std=gnu89
LINKFLAGS=-lm
-TESTS=test/echo-server.c test/test-*.c
-BENCHMARKS=test/echo-server.c test/benchmark-*.c
RUNNER_CFLAGS=$(CFLAGS) -D_GNU_SOURCE # Need _GNU_SOURCE for strdup?
RUNNER_LINKFLAGS=$(LINKFLAGS)
View
8 config-unix.mk
@@ -23,14 +23,14 @@ AR = $(PREFIX)ar
E=
CFLAGS=--std=gnu89 -g
LINKFLAGS=-lm
-TESTS=test/echo-server.c test/test-*.c
-BENCHMARKS=test/echo-server.c test/benchmark-*.c
ifeq (SunOS,$(uname_S))
LINKFLAGS+=-lsocket -lnsl
endif
-RUNNER_CFLAGS=$(CFLAGS) -D_GNU_SOURCE # Need _GNU_SOURCE for strdup?
+# Need _GNU_SOURCE for strdup?
+RUNNER_CFLAGS=$(CFLAGS) -D_GNU_SOURCE -DEV_MULTIPLICITY=0
+
RUNNER_LINKFLAGS=$(LINKFLAGS) -pthread
RUNNER_LIBS=
RUNNER_SRC=test/runner-unix.c
@@ -45,7 +45,7 @@ ev/ev.o: ev/config.h ev/ev.c
$(MAKE) -C ev
ev/config.h:
- cd ev && ./configure
+ cd ev && CPPFLAGS=-DEV_MULTIPLICITY=0 ./configure
clean-platform:
$(MAKE) -C ev clean
Please sign in to comment.
Something went wrong with that request. Please try again.