Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -109,23 +109,23 @@
 	    objfw-defs.h			\
 	    ${USE_INCLUDES_THREADS}
 
 SRCS += OFArray_adjacent.m		\
 	OFArray_adjacentSubarray.m	\
-	${AUTORELEASE_M}		\
-	${INSTANCE_M}			\
 	OFCountedSet_hashtable.m	\
 	OFDictionary_hashtable.m	\
 	OFMutableArray_adjacent.m	\
 	OFMutableDictionary_hashtable.m	\
 	OFMutableSet_hashtable.m	\
 	OFMutableString_UTF8.m		\
 	OFSet_hashtable.m		\
 	OFString_UTF8.m			\
 	${ASPRINTF_M}			\
+	${AUTORELEASE_M}		\
 	codepage_437.m			\
 	${FOUNDATION_COMPAT_M}		\
+	${INSTANCE_M}			\
 	iso_8859_15.m			\
 	windows_1252.m
 SRCS_SOCKETS += ${OFSTREAMOBSERVER_KQUEUE_M}	\
 		${OFSTREAMOBSERVER_POLL_M}	\
 		${OFSTREAMOBSERVER_SELECT_M}	\

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -34,15 +34,12 @@
 SRCS_THREADS = OFThreadTests.m
 
 IOS_USER ?= mobile
 IOS_TMP ?= /tmp/objfw-test
 
-.PHONY: run run-tests run-on-ios
+.PHONY: run run-on-ios run-on-android sign-for-ios
 run: all
-	if [ -z "${DONT_RUN_TESTS}" ]; then ${MAKE} ${MFLAGS} run-tests; fi
-
-run-tests: all
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR}
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}
 	rm -f libobjfw.dll libobjfw.dylib
 	if test -f ../src/libobjfw.so; then \
 		${LN_S} ../src/libobjfw.so libobjfw.so.${OBJFW_LIB_MAJOR}; \