summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPixel <pixel@nobis-crew.org>2011-10-09 13:24:33 -0700
committerPixel <pixel@nobis-crew.org>2011-10-09 13:24:33 -0700
commit74adacf6ec1de10b623112605b5d9610163522ec (patch)
tree8a2d283d7bdc5eacc347dc00837f5f1108d86f81 /Makefile
parent2367226978def1b3ab9d0a64996b1b938a5b27f2 (diff)
Adding libev.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 9 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index a5463d3..5d0ed2b 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ LD = g++
AS = gcc -c
AR = ar rcs
-CPPFLAGS += -DPIC -fPIC
+CPPFLAGS += -fPIC
LDFLAGS += -fPIC
ifeq ($(DEBUG),)
CPPFLAGS += -O3
@@ -21,7 +21,7 @@ CPPFLAGS += -g
LDFLAGS += -g
endif
-INCLUDES = includes libcoro libeio
+INCLUDES = includes libcoro libeio libev
ifeq ($(SYSTEM),Darwin)
LIBS += pthread
@@ -53,7 +53,7 @@ CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
LDFLAGS += $(ARCH_FLAGS) $(addprefix -l, $(LIBS))
vpath %.cc src:tests
-vpath %.c libcoro:libeio
+vpath %.c libcoro:libeio:libev
BALAU_SOURCES = \
BString.cc \
@@ -66,6 +66,10 @@ TaskMan.cc \
LIBCORO_SOURCES = \
coro.c \
+LIBEV_SOURCES = \
+ev.c \
+event.c \
+
LIBEIO_SOURCES = \
eio.c \
@@ -76,9 +80,9 @@ test-Tasks.cc \
LIB = libBalau.a
-BALAU_OBJECTS = $(addsuffix .o, $(notdir $(basename $(BALAU_SOURCES) $(LIBCORO_SOURCES))))
+BALAU_OBJECTS = $(addsuffix .o, $(notdir $(basename $(BALAU_SOURCES) $(LIBCORO_SOURCES) $(LIBEIO_SOURCES) $(LIBEV_SOURCES))))
-WHOLE_SOURCES = $(BALAU_SOURCES) $(LIBCORO_SOURCES) $(LIBEIO_SOURCES) $(TEST_SOURCES)
+WHOLE_SOURCES = $(BALAU_SOURCES) $(LIBCORO_SOURCES) $(LIBEIO_SOURCES) $(LIBEV_SOURCES) $(TEST_SOURCES)
TESTS = $(addsuffix .bin, $(notdir $(basename $(TEST_SOURCES))))
ALL_OBJECTS = $(addsuffix .o, $(notdir $(basename $(WHOLE_SOURCES))))