@@ -1,8 +1,8 @@
 include ../extra.mk
 
-SUBDIRS = ${RUNTIME} exceptions forwarding
+SUBDIRS = ${RUNTIME} exceptions ${ENCODINGS} forwarding
 SUBDIRS_AFTER = ${BRIDGE}
 DISTCLEAN = objfw-defs.h
 
 SHARED_LIB = ${OBJFW_SHARED_LIB}
 STATIC_LIB = ${OBJFW_STATIC_LIB}
@@ -152,27 +152,27 @@
 	OFMutableString_UTF8.m		\
 	OFSet_hashtable.m		\
 	OFString_UTF8.m			\
 	${AUTORELEASE_M}		\
 	${FOUNDATION_COMPAT_M}		\
-	${INSTANCE_M}			\
-	${UNICODE_M}			\
-	${ENCODINGS_SRCS}
+	${INSTANCE_M}
 SRCS_FILES += OFSettings_INIFile.m
 SRCS_SOCKETS += ${OFKERNELEVENTOBSERVER_EPOLL_M}	\
 		${OFKERNELEVENTOBSERVER_KQUEUE_M}	\
 		${OFKERNELEVENTOBSERVER_POLL_M}		\
 		${OFKERNELEVENTOBSERVER_SELECT_M}	\
 		OFTCPSocket+SOCKS5.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}
 
 include ../buildsys.mk
 
 CPPFLAGS += -I. -I.. -Iexceptions -Iruntime -DOF_COMPILING_OBJFW
 LD = ${OBJC}
 LDFLAGS += ${REEXPORT_LIBOBJC}