@@ -1,8 +1,8 @@
 include extra.mk
 
-SUBDIRS = src ${TESTS}
+SUBDIRS = src utils ${TESTS}
 DISTCLEAN = aclocal.m4		\
 	    autom4te.cache	\
 	    buildsys.mk		\
 	    config.h		\
 	    config.log		\
@@ -10,31 +10,10 @@
 	    extra.mk		\
 	    objfw-config
 
 include buildsys.mk
 
-install-extra:
-	for i in objfw-config objfw-compile; do \
-		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \
-			${INSTALL_OK}; \
-		else \
-			${INSTALL_FAILED}; \
-		fi \
-	done
-
-uninstall-extra:
-	for i in objfw-config objfw-compile; do \
-		if test -f ${DESTDIR}${bindir}/$$i; then \
-			if rm -f ${DESTDIR}${bindir}/$$i; then \
-				${DELETE_OK}; \
-			else \
-				${DELETE_FAILED}; \
-			fi \
-		fi \
-	done
-
 tarball:
 	V=$$(fgrep VERSION= objfw-config.in | sed 's/VERSION="\(.*\)"/\1/'); \
 	V2=$$(fgrep AC_INIT configure.ac | \
 	      sed 's/AC_INIT([^,]*,\([^,]*\),.*/\1/' | sed 's/ //'); \
 	V3=$$(fgrep -A1 CFBundleVersion Info.plist | tail -1 | \