diff --git a/Makefile b/Makefile
index c627ca9..064ce21 100644
--- a/Makefile
+++ b/Makefile
@@ -6,27 +6,10 @@ export DEBUG
 ROOT= $(shell pwd)
 export INCLUDE = -I$(ROOT)/include -I$(ROOT)/c-protobuf -I$(ROOT)/c-multihash/include -I$(ROOT)/c-multiaddr/include
 
-
-OBJS = \
-	conn/*.o \
-	crypto/*.o \
-	crypto/encoding/*.o \
-	db/*.o \
-	thirdparty/mbedtls/*.o \
-	hashmap/hashmap.o \
-	identify/*.o \
-	net/*.o \
-	os/*.o \
-	peer/*.o \
-	record/*.o \
-	routing/*.o \
-	secio/*.o \
-	utils/*.o \
-	swarm/*.o \
-	yamux/*.o
+OBJS = $(shell (find $(COMPONENTS) -name *.o))
 
 link: compile
-	ar rcs libp2p.a $(OBJS) $(LINKER_FLAGS)
+	$(AR) rcs libp2p.a $(OBJS) $(LINKER_FLAGS)
 
 compile:
 	$(foreach dir,$(COMPONENTS), $(MAKE) -C $(dir) all ;)