diff --git a/Makefile b/Makefile
index 1bb19df..ffa421e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,17 @@
 
 CC := gcc
-CFLAGS := -g -O3 -std=c99 -Wall -Wextra -Wpedantic
+CFLAGS := -g -O3 -std=c2x -Wall -Wextra -Wpedantic -Werror
 
 OBJS := obj/arena.o obj/alloc_backend.o
 
 all : test/test_arena
 
-test/test_arena : src/test_arena.c $(OBJS) | test
+test/test_arena : src/test_arena.c obj/libarena.o | test
 	$(CC) -o $@ $(CFLAGS) $^
 
+obj/libarena.o : obj/arena.o obj/alloc_backend.o | obj
+	ld -r -o $@ $^
+
 obj/%.o : src/%.c | obj
 	$(CC) -o $@ -c $(CFLAGS) $<