Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -374,22 +374,31 @@
 	BUILDSYS_FRAMEWORK([
 		AC_SUBST(OBJFW_FRAMEWORK, "ObjFW.framework")
 		build_framework="yes"
 	])
 ], [
-	AC_DEFINE(OF_NO_SHARED, 1, [Whether no shared library was built])
-	AC_SUBST(LIBOBJFW_DEP, "../src/libobjfw.a")
-	AC_SUBST(LIBOBJFW_DEP_LVL2, "../../src/libobjfw.a")
+	AS_IF([test x"$enable_amiga_lib" != x"no"], [
+		AC_SUBST(OBJFW_LIBS, "-lobjfw.library")
+		tmp="../src/linklib/libobjfw.library.a"
+		AC_SUBST(LIBOBJFW_DEP, "$tmp")
+		AC_SUBST(LIBOBJFW_DEP_LVL2, "../$tmp")
+	], [
+		AC_SUBST(OBJFW_LIBS, "-lobjfw")
+		AC_SUBST(LIBOBJFW_DEP, "../src/libobjfw.a")
+		AC_SUBST(LIBOBJFW_DEP_LVL2, "../../src/libobjfw.a")
+
+		AC_DEFINE(OF_NO_SHARED, 1, [Whether no shared library is built])
+	])
 ])
 
 AS_IF([test x"$build_framework" = x"yes"], [
 	TESTS_LIBS="-framework ObjFW \${RUNTIME_FRAMEWORK_LIBS} $TESTS_LIBS"
 	TESTS_LIBS="-F../src -F../src/runtime $TESTS_LIBS"
 ], [
-	TESTS_LIBS="\${RUNTIME_LIBS} $TESTS_LIBS"
+	TESTS_LIBS="\${OBJFW_LIBS} \${RUNTIME_LIBS} $TESTS_LIBS"
 	TESTS_LIBS="-L../src/runtime -L../src/runtime/linklib $TESTS_LIBS"
-	TESTS_LIBS="-L../src -lobjfw $TESTS_LIBS"
+	TESTS_LIBS="-L../src -L../src/linklib $TESTS_LIBS"
 ])
 
 AC_ARG_ENABLE(amiga-lib,
 	AS_HELP_STRING([--disable-amiga-lib], [do not build Amiga library]))
 AS_IF([test x"$supports_amiga_lib" != x"yes"], [enable_amiga_lib="no"])

Index: extra.mk.in
==================================================================
--- extra.mk.in
+++ extra.mk.in
@@ -59,10 +59,11 @@
 LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LIB_A@
 LOOKUP_ASM_LOOKUP_ASM_A = @LOOKUP_ASM_LOOKUP_ASM_A@
 LOOKUP_ASM_LOOKUP_ASM_AMIGALIB_A = @LOOKUP_ASM_LOOKUP_ASM_AMIGALIB_A@
 LOOKUP_ASM_LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LOOKUP_ASM_LIB_A@
 MAP_LDFLAGS = @MAP_LDFLAGS@
+OBJFW_LIBS = @OBJFW_LIBS@
 OFARC = @OFARC@
 OFDNS = @OFDNS@
 OFHASH = @OFHASH@
 OFHTTP = @OFHTTP@
 OFSOCK = @OFSOCK@

Index: utils/objfw-config.in
==================================================================
--- utils/objfw-config.in
+++ utils/objfw-config.in
@@ -30,11 +30,11 @@
 LIB_PREFIX="@LIB_PREFIX@"
 LIB_SUFFIX="@LIB_SUFFIX@"
 LDFLAGS="@LDFLAGS@"
 LDFLAGS_REEXPORT="@LDFLAGS_REEXPORT@"
 LDFLAGS_RPATH="@LDFLAGS_RPATH@"
-LIBS="-L${libdir} -lobjfw @RUNTIME_LIBS@ @LIBS@"
+LIBS="-L${libdir} @OBJFW_LIBS@ @RUNTIME_LIBS@ @LIBS@"
 FRAMEWORK_LIBS="-F${prefix}/Library/Frameworks -framework ObjFW"
 FRAMEWORK_LIBS="$FRAMEWORK_LIBS @RUNTIME_FRAMEWORK_LIBS@ @LIBS@"
 PLUGIN_CFLAGS="@PLUGIN_CFLAGS@"
 PLUGIN_LDFLAGS="@PLUGIN_LDFLAGS@"
 PLUGIN_SUFFIX="@PLUGIN_SUFFIX@"