diff --git a/Makefile b/Makefile
index 7e1345d00..ac9f3061e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-TARGETS = server sim random
+TARGETS = server send receive random test
 
-SRCS = server.c test.c node.c path.c utils.c msg.c
+SRCS = server.c send.c receive.c random.c node.c path.c utils.c msg.c cfg.c caps.c
 VPATH = src
 
 CC = gcc
@@ -11,7 +11,7 @@ GIT_REV = $(shell git rev-parse --short HEAD)
 
 V ?= 4
 
-LDFLAGS = -pthread -lrt -lm
+LDFLAGS = -pthread -lrt -lm -lconfig -lnl-3 -lnl-route-3
 CFLAGS = -g -std=c99 -Iinclude/ -D_XOPEN_SOURCE=500 -DV=$(V)
 CFLAGS += -D__GIT_REV__='"$(GIT_REV)"' -D__GIT_TAG__='"$(GIT_TAG)"'
 
@@ -19,9 +19,11 @@ CFLAGS += -D__GIT_REV__='"$(GIT_REV)"' -D__GIT_TAG__='"$(GIT_TAG)"'
 
 all: $(TARGETS)
 
-server: node.o msg.o utils.o path.o
-sim: msg.o utils.o
+server: node.o msg.o utils.o path.o cfg.o caps.o
+send: msg.o utils.o
+receive: msg.o utils.o
 random: msg.o utils.o
+test: msg.o utils.o
 
 %.d: %.c
 	$(CC) -MM $(CFLAGS) $< -o $@