Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -368,17 +368,13 @@
 	AS_HELP_STRING([--disable-shared], [do not build shared library]))
 AS_IF([test x"$enable_shared" != x"no"], [
 	BUILDSYS_SHARED_LIB
 	AC_SUBST(OBJFW_SHARED_LIB, "${LIB_PREFIX}objfw${LIB_SUFFIX}")
 	AC_SUBST(EXCEPTIONS_LIB_A, "exceptions.lib.a")
-	AC_SUBST(EXCEPTIONS_EXCEPTIONS_LIB_A, "exceptions/exceptions.lib.a")
 	AC_SUBST(FORWARDING_LIB_A, "forwarding.lib.a")
-	AC_SUBST(FORWARDING_FORWARDING_LIB_A, "forwarding/forwarding.lib.a")
 	AC_SUBST(INVOCATION_LIB_A, "invocation.lib.a")
-	AC_SUBST(INVOCATION_INVOCATION_LIB_A, "invocation/invocation.lib.a")
 	AC_SUBST(LOOKUP_ASM_LIB_A, "lookup-asm.lib.a")
-	AC_SUBST(LOOKUP_ASM_LOOKUP_ASM_LIB_A, "lookup-asm/lookup-asm.lib.a")
 
 	BUILDSYS_FRAMEWORK([
 		AC_SUBST(OBJFW_FRAMEWORK, "ObjFW.framework")
 		build_framework="yes"
 	])
@@ -407,17 +403,13 @@
 
 AC_ARG_ENABLE(static, AS_HELP_STRING([--enable-static], [build static library]))
 AS_IF([test x"$enable_static" = x"yes" -o x"$enable_amiga_lib" != x"no"], [
 	AC_SUBST(OBJFW_STATIC_LIB, "libobjfw.a")
 	AC_SUBST(EXCEPTIONS_A, "exceptions.a")
-	AC_SUBST(EXCEPTIONS_EXCEPTIONS_A, "exceptions/exceptions.a")
 	AC_SUBST(FORWARDING_A, "forwarding.a")
-	AC_SUBST(FORWARDING_FORWARDING_A, "forwarding/forwarding.a")
 	AC_SUBST(INVOCATION_A, "invocation.a")
-	AC_SUBST(INVOCATION_INVOCATION_A, "invocation/invocation.a")
 	AC_SUBST(LOOKUP_ASM_A, "lookup-asm.a")
-	AC_SUBST(LOOKUP_ASM_LOOKUP_ASM_A, "lookup-asm/lookup-asm.a")
 ])
 
 AC_DEFINE_UNQUOTED(PLUGIN_SUFFIX, "$PLUGIN_SUFFIX", [Suffix for plugins])
 AS_IF([test x"$enable_files" != x"no" -a x"$PLUGIN_SUFFIX" != x""], [
 	AC_SUBST(USE_SRCS_PLUGINS, '${SRCS_PLUGINS}')

Index: extra.mk.in
==================================================================
--- extra.mk.in
+++ extra.mk.in
@@ -20,37 +20,27 @@
 BIN_PREFIX = @BIN_PREFIX@
 BRIDGE = @BRIDGE@
 CVINCLUDE_INLINE_H = @CVINCLUDE_INLINE_H@
 ENCODINGS = @ENCODINGS@
 ENCODINGS_A = @ENCODINGS_A@
-ENCODINGS_ENCODINGS_A = @ENCODINGS_ENCODINGS_A@
-ENCODINGS_ENCODINGS_LIB_A = @ENCODINGS_ENCODINGS_LIB_A@
 ENCODINGS_LIB_A = @ENCODINGS_LIB_A@
 ENCODINGS_SRCS = @ENCODINGS_SRCS@
 EXCEPTIONS_A = @EXCEPTIONS_A@
-EXCEPTIONS_EXCEPTIONS_A = @EXCEPTIONS_EXCEPTIONS_A@
-EXCEPTIONS_EXCEPTIONS_LIB_A = @EXCEPTIONS_EXCEPTIONS_LIB_A@
 EXCEPTIONS_LIB_A = @EXCEPTIONS_LIB_A@
 FISH_COMPLETIONS = @FISH_COMPLETIONS@
 FORWARDING_A = @FORWARDING_A@
-FORWARDING_FORWARDING_A = @FORWARDING_FORWARDING_A@
-FORWARDING_FORWARDING_LIB_A = @FORWARDING_FORWARDING_LIB_A@
 FORWARDING_LIB_A = @FORWARDING_LIB_A@
 INVOCATION_A = @INVOCATION_A@
-INVOCATION_INVOCATION_A = @INVOCATION_INVOCATION_A@
-INVOCATION_INVOCATION_LIB_A = @INVOCATION_INVOCATION_LIB_A@
 INVOCATION_LIB_A = @INVOCATION_LIB_A@
 LIBBASES_M = @LIBBASES_M@
 LIBOBJFWRT_DEP = @LIBOBJFWRT_DEP@
 LIBOBJFWRT_DEP_LVL2 = @LIBOBJFWRT_DEP_LVL2@
 LIBOBJFW_DEP = @LIBOBJFW_DEP@
 LIBOBJFW_DEP_LVL2 = @LIBOBJFW_DEP_LVL2@
 LINKLIB = @LINKLIB@
 LOOKUP_ASM_A = @LOOKUP_ASM_A@
 LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LIB_A@
-LOOKUP_ASM_LOOKUP_ASM_A = @LOOKUP_ASM_LOOKUP_ASM_A@
-LOOKUP_ASM_LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LOOKUP_ASM_LIB_A@
 MAP_LDFLAGS = @MAP_LDFLAGS@
 OFARC = @OFARC@
 OFDNS = @OFDNS@
 OFHASH = @OFHASH@
 OFHTTP = @OFHTTP@

Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -228,20 +228,18 @@
 		${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}	\
-	     ${INVOCATION_INVOCATION_A}
-LIB_OBJS_EXTRA = ${RUNTIME_RUNTIME_LIB_A}	\
-		 ${EXCEPTIONS_EXCEPTIONS_LIB_A}	\
-		 ${ENCODINGS_ENCODINGS_LIB_A}	\
-		 ${FORWARDING_FORWARDING_LIB_A}	\
-		 ${INVOCATION_INVOCATION_LIB_A}
+OBJS_EXTRA = exceptions/exceptions.a	\
+	     encodings/encodings.a	\
+	     forwarding/forwarding.a	\
+	     invocation/invocation.a
+LIB_OBJS_EXTRA = exceptions/exceptions.lib.a	\
+		 encodings/encodings.lib.a	\
+		 forwarding/forwarding.lib.a	\
+		 invocation/invocation.lib.a
 
 include ../buildsys.mk
 
 CPPFLAGS += -I. -I.. -Iexceptions -Iruntime
 LD = ${OBJC}

Index: src/runtime/Makefile
==================================================================
--- src/runtime/Makefile
+++ src/runtime/Makefile
@@ -38,15 +38,15 @@
 	       threading.m	\
 	       tlskey.m
 INCLUDES = ObjFWRT.h
 includesubdir = ObjFWRT
 
-OBJS_EXTRA = ${LOOKUP_ASM_LOOKUP_ASM_A}
-LIB_OBJS_EXTRA = ${LOOKUP_ASM_LOOKUP_ASM_LIB_A}
+OBJS_EXTRA = lookup-asm/lookup-asm.a
+LIB_OBJS_EXTRA = lookup-asm/lookup-asm.lib.a
 AMIGA_LIB_OBJS_START = amiga-library.amigalib.o
-AMIGA_LIB_OBJS_EXTRA = amiga-glue.amigalib.o		\
-		       ${LOOKUP_ASM_LOOKUP_ASM_A}	\
+AMIGA_LIB_OBJS_EXTRA = amiga-glue.amigalib.o	\
+		       lookup-asm/lookup-asm.a	\
 		       amiga-end.amigalib.o
 
 include ../../buildsys.mk
 
 ${OBJFWRT_AMIGA_LIB}: inline.h