Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -53,10 +53,11 @@
 		enable_files="yes"	# Required for reading ENV:
 		enable_shared="no"
 		supports_amiga_lib="yes"
 
 		AS_IF([test x"$enable_amiga_lib" != x"no"], [
+			AC_SUBST(OBJFW_AMIGA_LIB, objfw68k.library)
 			AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt68k.library)
 			AC_SUBST(SFDC_TARGET, m68k-amigaos)
 			AC_SUBST(SFD_FILE, amigaos3.sfd)
 			AC_SUBST(SFDC_INLINE_H, inline.h)
 			dnl For 68000, GCC emits calls to helper functions that
@@ -88,10 +89,11 @@
 			enable_files="yes"	# Required for reading ENV:
 			supports_amiga_lib="yes"
 			check_pedantic="no"	# Breaks generated inlines
 
 			AS_IF([test x"$enable_amiga_lib" != x"no"], [
+				AC_SUBST(OBJFW_AMIGA_LIB, objfw.library)
 				AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt.library)
 				AC_SUBST(CVINCLUDE_INLINE_H, inline.h)
 				t="-mresident32 -ffreestanding -noixemul"
 				AC_SUBST(AMIGA_LIB_CFLAGS, $t)
 				t="-mresident32 -nostartfiles -nodefaultlibs"
@@ -377,10 +379,14 @@
 ], [
 	TESTS_LIBS="\${RUNTIME_LIBS} $TESTS_LIBS"
 	TESTS_LIBS="-L../src/runtime -L../src/runtime/linklib $TESTS_LIBS"
 	TESTS_LIBS="-L../src -lobjfw $TESTS_LIBS"
 ])
+
+AS_IF([test x"$enable_amiga_lib" != x"no"], [
+	AC_SUBST(LINKLIB, linklib)
+])
 
 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"])
 
@@ -531,11 +537,10 @@
 			AC_SUBST(RUNTIME_FRAMEWORK_LIBS, "-framework ObjFWRT")
 		])
 
 		AS_IF([test x"$enable_amiga_lib" != x"no"], [
 			AC_SUBST(RUNTIME_LIBS, "-lobjfwrt.library")
-			AC_SUBST(LINKLIB, linklib)
 			tmp="../src/runtime/linklib/libobjfwrt.library.a"
 			AC_SUBST(LIBOBJFWRT_DEP, "$tmp")
 			AC_SUBST(LIBOBJFWRT_DEP_LVL2, "../$tmp")
 		], [
 			AC_SUBST(RUNTIME_LIBS, "-lobjfwrt")

Index: extra.mk.in
==================================================================
--- extra.mk.in
+++ extra.mk.in
@@ -1,8 +1,9 @@
 OBJFW_SHARED_LIB = @OBJFW_SHARED_LIB@
 OBJFW_STATIC_LIB = @OBJFW_STATIC_LIB@
 OBJFW_FRAMEWORK = @OBJFW_FRAMEWORK@
+OBJFW_AMIGA_LIB = @OBJFW_AMIGA_LIB@
 # When changing: Be sure to also change these in the Xcode project!
 OBJFW_LIB_MAJOR = 9
 OBJFW_LIB_MINOR = 1
 OBJFW_LIB_MAJOR_MINOR = ${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR}
 

Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -5,10 +5,11 @@
 DISTCLEAN = objfw-defs.h
 
 SHARED_LIB = ${OBJFW_SHARED_LIB}
 STATIC_LIB = ${OBJFW_STATIC_LIB}
 FRAMEWORK = ${OBJFW_FRAMEWORK}
+AMIGA_LIB = ${OBJFW_AMIGA_LIB}
 LIB_MAJOR = ${OBJFW_LIB_MAJOR}
 LIB_MINOR = ${OBJFW_LIB_MINOR}
 
 SRCS = OFASN1BitString.m		\
        OFASN1Boolean.m			\