@@ -8,11 +8,10 @@
 	boot.dol		\
 	${PROG_NOINST}.arm9	\
 	${PROG_NOINST}.nds	\
 	${PROG_NOINST}.nro	\
 	${PROG_NOINST}.rpx	\
-	serialization_xml.m	\
 	testfile_bin.m		\
 	testfile_ini.m
 DISTCLEAN = Info.plist
 
 PROG_NOINST = tests${PROG_SUFFIX}
@@ -21,20 +20,23 @@
        OFASN1DERParsingTests.m		\
        OFASN1DERRepresentationTests.m	\
        OFArrayTests.m			\
        ${OF_BLOCK_TESTS_M}		\
        OFCharacterSetTests.m		\
+       OFColorTests.m			\
        OFDataTests.m			\
        OFDateTests.m			\
        OFDictionaryTests.m		\
        OFHMACTests.m			\
        OFINIFileTests.m			\
+       OFIRITests.m			\
        OFInvocationTests.m		\
        OFJSONTests.m			\
        OFListTests.m			\
        OFLocaleTests.m			\
        OFMD5HashTests.m			\
+       OFMatrix4x4Tests.m		\
        OFMemoryStreamTests.m		\
        OFMethodSignatureTests.m		\
        OFNotificationCenterTests.m	\
        OFNumberTests.m			\
        OFObjectTests.m			\
@@ -45,16 +47,14 @@
        OFSHA224HashTests.m		\
        OFSHA256HashTests.m		\
        OFSHA384HashTests.m		\
        OFSHA512HashTests.m		\
        OFScryptTests.m			\
-       OFSerializationTests.m		\
        OFSetTests.m			\
        OFStreamTests.m			\
        OFStringTests.m			\
        OFSystemInfoTests.m		\
-       OFURITests.m			\
        OFValueTests.m			\
        OFXMLElementBuilderTests.m	\
        OFXMLNodeTests.m			\
        OFXMLParserTests.m		\
        RuntimeTests.m			\
@@ -63,11 +63,10 @@
        ${USE_SRCS_FILES}		\
        ${USE_SRCS_PLUGINS}		\
        ${USE_SRCS_SOCKETS}		\
        ${USE_SRCS_THREADS}		\
        ${USE_SRCS_WINDOWS}		\
-       serialization_xml.m		\
        testfile_bin.m			\
        testfile_ini.m
 SRCS_PLUGINS = OFPluginTests.m
 SRCS_SOCKETS = OFDNSResolverTests.m		\
 	       ${OF_HTTP_CLIENT_TESTS_M}	\
@@ -92,12 +91,10 @@
 IOS_USER ?= mobile
 IOS_TMP ?= /tmp/objfw-test
 
 include ../buildsys.mk
 
-serialization_xml.m: serialization.xml
-	${SHELL} ../utils/objfw-embed serialization.xml serialization.xml $@
 testfile_bin.m: testfile.bin
 	${SHELL} ../utils/objfw-embed testfile.bin testfile.bin $@
 testfile_ini.m: testfile.ini
 	${SHELL} ../utils/objfw-embed testfile.ini testfile.ini $@
 
@@ -108,11 +105,10 @@
 	rm -f objfw${OBJFW_LIB_MAJOR}.dll libobjfw.${OBJFW_LIB_MAJOR}.dylib
 	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR}
 	rm -f libobjfwrt.so.${OBJFWRT_LIB_MAJOR_MINOR}
 	rm -f objfwrt${OBJFWRT_LIB_MAJOR}.dll
 	rm -f libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib
-	rm -f ${OBJFWRT_AMIGA_LIB}
 	if test -f ../src/libobjfw.so; then \
 		${LN_S} ../src/libobjfw.so libobjfw.so.${OBJFW_LIB_MAJOR}; \
 		${LN_S} ../src/libobjfw.so \
 		    libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; \
 	elif test -f ../src/libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}; then \
@@ -141,14 +137,10 @@
 	fi
 	if test -f ../src/runtime/libobjfwrt.dylib; then \
 		${LN_S} ../src/runtime/libobjfwrt.dylib \
 		    libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib; \
 	fi
-	if test -f ../src/runtime/${OBJFWRT_AMIGA_LIB}; then \
-		${LN_S} ../src/runtime/${OBJFWRT_AMIGA_LIB} \
-		    ${OBJFWRT_AMIGA_LIB}; \
-	fi
 	LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \
 	DYLD_FRAMEWORK_PATH=../src:../src/runtime$${DYLD_FRAMEWORK_PATH+:}$$DYLD_FRAMEWORK_PATH \
 	DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \
 	LIBRARY_PATH=.$${LIBRARY_PATH+:}$$LIBRARY_PATH \
 	ASAN_OPTIONS=allocator_may_return_null=1 \