Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -412,14 +412,13 @@
 
 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"])
 AS_IF([test x"$enable_amiga_lib" != x"no"], [
-	AC_SUBST(OBJFW_STATIC_LIB, "libobjfw.a")
-	AC_SUBST(EXCEPTIONS_A, "exceptions.a")
-	AC_SUBST(FORWARDING_A, "forwarding.a")
-	AC_SUBST(INVOCATION_A, "invocation.a")
+	AC_SUBST(EXCEPTIONS_AMIGALIB_A, "exceptions.amigalib.a")
+	AC_SUBST(FORWARDING_AMIGALIB_A, "forwarding.amigalib.a")
+	AC_SUBST(INVOCATION_AMIGALIB_A, "invocation.amigalib.a")
 	AC_SUBST(LOOKUP_ASM_AMIGALIB_A, "lookup-asm.amigalib.a")
 ])
 
 AC_ARG_ENABLE(static, AS_HELP_STRING([--enable-static], [build static library]))
 AS_IF([test x"$enable_shared" = x"no" -a x"$enable_amiga_lib" = x"no"], [
@@ -978,20 +977,16 @@
 AS_IF([test x"$ENCODINGS_SRCS" != x""], [
 	AC_SUBST(ENCODINGS, "encodings")
 
 	AS_IF([test x"$enable_shared" != x"no"], [
 		AC_SUBST(ENCODINGS_LIB_A, "encodings.lib.a")
-		AC_SUBST(ENCODINGS_ENCODINGS_LIB_A, "encodings/encodings.lib.a")
 	])
-	AS_IF([test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"], [
+	AS_IF([test x"$enable_static" = x"yes"], [
 		AC_SUBST(ENCODINGS_A, "encodings.a")
-		AC_SUBST(ENCODINGS_ENCODINGS_A, "encodings/encodings.a")
 	])
 	AS_IF([test x"$enable_amiga_lib" != x"no"], [
 		AC_SUBST(ENCODINGS_AMIGALIB_A, "encodings.amigalib.a")
-		AC_SUBST(ENCODINGS_ENCODINGS_AMIGALIB_A,
-			"encodings/encodings.amigalib.a")
 	])
 ])
 
 AC_CHECK_FUNCS(arc4random arc4random_buf getrandom random, break)
 

Index: utils/ofarc/Makefile
==================================================================
--- utils/ofarc/Makefile
+++ utils/ofarc/Makefile
@@ -18,10 +18,10 @@
 CPPFLAGS += -I../../src					\
 	    -I../../src/runtime				\
 	    -I../../src/exceptions			\
 	    -I../..					\
 	    -DLANGUAGE_DIR=\"${datadir}/ofarc/lang\"
-LIBS := -L../../src -lobjfw						\
+LIBS := -L../../src -L../../src/linklib ${OBJFW_LIBS}			\
 	-L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS}	\
 	${LIBS}
 LD = ${OBJC}
 LDFLAGS += ${LDFLAGS_RPATH}

Index: utils/ofdns/Makefile
==================================================================
--- utils/ofdns/Makefile
+++ utils/ofdns/Makefile
@@ -14,10 +14,10 @@
 CPPFLAGS += -I../../src					\
 	    -I../../src/runtime				\
 	    -I../../src/exceptions			\
 	    -I../..					\
 	    -DLANGUAGE_DIR=\"${datadir}/ofdns/lang\"
-LIBS := -L../../src -lobjfw						\
+LIBS := -L../../src -L../../src/linklib ${OBJFW_LIBS}			\
 	-L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS}	\
 	${LIBS}
 LD = ${OBJC}
 LDFLAGS += ${LDFLAGS_RPATH}

Index: utils/ofhash/Makefile
==================================================================
--- utils/ofhash/Makefile
+++ utils/ofhash/Makefile
@@ -14,10 +14,10 @@
 CPPFLAGS += -I../../src					\
 	    -I../../src/runtime				\
 	    -I../../src/exceptions			\
 	    -I../..					\
 	    -DLANGUAGE_DIR=\"${datadir}/ofhash/lang\"
-LIBS := -L../../src -lobjfw						\
+LIBS := -L../../src -L../../src/linklib ${OBJFW_LIBS}			\
 	-L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS}	\
 	${LIBS}
 LD = ${OBJC}
 LDFLAGS += ${LDFLAGS_RPATH}

Index: utils/ofhttp/Makefile
==================================================================
--- utils/ofhttp/Makefile
+++ utils/ofhttp/Makefile
@@ -15,10 +15,10 @@
 CPPFLAGS += -I../../src					\
 	    -I../../src/runtime				\
 	    -I../../src/exceptions			\
 	    -I../..					\
 	    -DLANGUAGE_DIR=\"${datadir}/ofhttp/lang\"
-LIBS := -L../../src -lobjfw						\
+LIBS := -L../../src -L../../src/linklib ${OBJFW_LIBS}			\
 	-L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS}	\
 	${LIBS}
 LD = ${OBJC}
 LDFLAGS += ${LDFLAGS_RPATH}

Index: utils/ofsock/Makefile
==================================================================
--- utils/ofsock/Makefile
+++ utils/ofsock/Makefile
@@ -11,10 +11,10 @@
 
 CPPFLAGS += -I../../src					\
 	    -I../../src/runtime				\
 	    -I../../src/exceptions			\
 	    -I../..
-LIBS := -L../../src -lobjfw						\
+LIBS := -L../../src -L../../src/linklib ${OBJFW_LIBS}			\
 	-L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS}	\
 	${LIBS}
 LD = ${OBJC}
 LDFLAGS += ${LDFLAGS_RPATH}