Commit 926e55d4 authored by Juliusz Chroboczek's avatar Juliusz Chroboczek

Fix merge conflicts.

parent aa87d6fe
......@@ -9,10 +9,10 @@ CFLAGS = $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES)
LDLIBS = -lrt
SRCS = babel.c net.c kernel.c util.c network.c source.c neighbour.c \
route.c xroute.c message.c request.c filter.c
route.c xroute.c message.c resend.c filter.c local.c
OBJS = babel.o net.o kernel.o util.o network.o source.o neighbour.o \
route.o xroute.o message.o request.o filter.o
route.o xroute.o message.o resend.o filter.o local.o
babel: $(OBJS)
$(CC) $(CFLAGS) $(LDFLAGS) -o babel $(OBJS) $(LDLIBS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment