Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -1,4 +1,6 @@
-SUBDIRS = src tests
+include extra.mk
+
+SUBDIRS = src ${TESTS}
 DISTCLEAN = aclocal.m4 autom4te.cache buildsys.mk config.log config.status
 
 include buildsys.mk

Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -30,9 +30,11 @@
 	have_sel_getName="yes"
 	AC_DEFINE(HAVE_SEL_GETNAME, 1, [Whether we have sel_getName])])
 test x"$have_sel_get_name" != x"yes" -a x"$have_sel_getName" != x"yes" && \
 	AC_ERROR(You need either sel_get_name or sel_getName in libobjc!)
 
+test $cross_compiling != x"yes" && AC_SUBST(TESTS, "tests")
+
 AC_SUBST(PACKAGE, objfw)
-AC_CONFIG_FILES(buildsys.mk)
+AC_CONFIG_FILES([buildsys.mk extra.mk])
 AC_CONFIG_HEADERS(config.h)
 AC_OUTPUT

Index: src/OFArray.h
==================================================================
--- src/OFArray.h
+++ src/OFArray.h
@@ -24,8 +24,8 @@
 - (size_t)size;
 - (void*)item: (size_t)item;
 - (void*)last;
 - add: (void*)item;
 - addNItems: (size_t)nitems
-    fromCArray: (void*)carray;
+ fromCArray: (void*)carray;
 - removeLastNItems: (size_t)nitems;
 @end