@@ -1,8 +1,8 @@
 include ../extra.mk
 
-SUBDIRS = ${RUNTIME} exceptions ${BRIDGE}
+SUBDIRS = ${RUNTIME} exceptions ${BRIDGE} forwarding
 
 SHARED_LIB = ${OBJFW_SHARED_LIB}
 STATIC_LIB = ${OBJFW_STATIC_LIB}
 LIB_MAJOR = ${OBJFW_LIB_MAJOR}
 LIB_MINOR = ${OBJFW_LIB_MINOR}
@@ -116,24 +116,27 @@
 	OFMutableString_UTF8.m		\
 	OFSet_hashtable.m		\
 	OFString_UTF8.m			\
 	${ASPRINTF_M}			\
 	codepage_437.m			\
-	forwarding.S			\
 	${FOUNDATION_COMPAT_M}		\
 	iso_8859_15.m			\
 	windows_1252.m
 SRCS_SOCKETS += ${OFSTREAMOBSERVER_KQUEUE_M}	\
 		${OFSTREAMOBSERVER_POLL_M}	\
 		${OFSTREAMOBSERVER_SELECT_M}	\
 		OFTCPSocket+SOCKS5.m
 
-OBJS_EXTRA = ${EXCEPTIONS_EXCEPTIONS_A} ${RUNTIME_RUNTIME_A}
-LIB_OBJS_EXTRA = ${EXCEPTIONS_EXCEPTIONS_LIB_A} ${RUNTIME_RUNTIME_LIB_A}
+OBJS_EXTRA = ${RUNTIME_RUNTIME_A}	\
+	     ${EXCEPTIONS_EXCEPTIONS_A} \
+	     ${FORWARDING_FORWARDING_A}
+LIB_OBJS_EXTRA = ${RUNTIME_RUNTIME_LIB_A}	\
+		 ${EXCEPTIONS_EXCEPTIONS_LIB_A}	\
+		 ${FORWARDING_FORWARDING_LIB_A}
 
 include ../buildsys.mk
 
 CPPFLAGS += -I. -I.. -Iexceptions -Iruntime
 LD = ${OBJC}
 LDFLAGS += ${REEXPORT_LIBOBJC}
 
 ${BRIDGE}: ${SHARED_LIB}