@@ -212,18 +212,16 @@
 		${OF_KQUEUE_KERNEL_EVENT_OBSERVER_M}	\
 		${OF_POLL_KERNEL_EVENT_OBSERVER_M}	\
 		${OF_SELECT_KERNEL_EVENT_OBSERVER_M}	\
 		OFTCPSocketSOCKS5Connector.m
 
-OBJS_EXTRA = ${RUNTIME_RUNTIME_A}	\
-	     ${EXCEPTIONS_EXCEPTIONS_A} \
-	     ${ENCODINGS_ENCODINGS_A}	\
-	     ${FORWARDING_FORWARDING_A}
-LIB_OBJS_EXTRA = ${RUNTIME_RUNTIME_LIB_A}	\
-		 ${EXCEPTIONS_EXCEPTIONS_LIB_A}	\
-		 ${ENCODINGS_ENCODINGS_LIB_A}	\
-		 ${FORWARDING_FORWARDING_LIB_A}
+OBJS_EXTRA = exceptions/exceptions.a	\
+	     encodings/encodings.a	\
+	     forwarding/forwarding.a
+LIB_OBJS_EXTRA = exceptions/exceptions.lib.a	\
+		 encodings/encodings.lib.a	\
+		 forwarding/forwarding.lib.a
 
 include ../buildsys.mk
 
 CPPFLAGS += -I. -I.. -Iexceptions -Iruntime
 LD = ${OBJC}