diff --git a/Makefile.in b/Makefile.in
index e33bf69..3237a9a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,25 +1,33 @@
-SUBDIRS = @subdirs@
+XVOLKEYS = @xvolkeys@
 
 all:
-	for i in ${SUBDIRS}; do (cd $$i && ${MAKE}); done
+	@cd libsndio && ${MAKE}
+	@cd sndiod && ${MAKE}
+	@cd sndioctl && ${MAKE}
+	@cd aucat && ${MAKE}
+	@if test ${XVOLKEYS} = yes; then cd xvolkeys && ${MAKE}; fi
 
 install:
-	for i in ${SUBDIRS}; do (cd $$i && ${MAKE} install); done
+	@cd libsndio && ${MAKE} install
+	@cd sndiod && ${MAKE} install
+	@cd sndioctl && ${MAKE} install
+	@cd aucat && ${MAKE} install
+	@if test ${XVOLKEYS} = yes; then cd xvolkeys && ${MAKE} install; fi
 
 uninstall:
-	cd aucat && ${MAKE} uninstall
-	cd sndioctl && ${MAKE} uninstall
-	cd sndiod && ${MAKE} uninstall
-	cd libsndio && ${MAKE} uninstall
-	cd xvolkeys && ${MAKE} uninstall
+	@cd xvolkeys && ${MAKE} uninstall
+	@cd aucat && ${MAKE} uninstall
+	@cd sndioctl && ${MAKE} uninstall
+	@cd sndiod && ${MAKE} uninstall
+	@cd libsndio && ${MAKE} uninstall
 
 clean:
-	cd aucat && ${MAKE} clean
-	cd sndioctl && ${MAKE} clean
-	cd sndiod && ${MAKE} clean
-	cd libsndio && ${MAKE} clean
-	cd examples && ${MAKE} clean
-	cd xvolkeys && ${MAKE} clean
+	@cd aucat && ${MAKE} clean
+	@cd sndioctl && ${MAKE} clean
+	@cd sndiod && ${MAKE} clean
+	@cd libsndio && ${MAKE} clean
+	@cd examples && ${MAKE} clean
+	@cd xvolkeys && ${MAKE} clean
 
 distclean:	clean
 	rm -f \
diff --git a/configure b/configure
index e22f867..5f10120 100755
--- a/configure
+++ b/configure
@@ -45,11 +45,6 @@ unset libdir				# path where to install library
 unset defs				# no extra #defines
 unset ldadd				# no extra libraries (-l options)
 
-#
-# components to build
-#
-subdirs="libsndio sndioctl sndiod aucat"
-
 #
 # guess OS-specific parameters
 #
@@ -173,13 +168,6 @@ if [ $rmidi = yes ]; then
 	defs="$defs -DUSE_RMIDI"
 fi
 
-#
-# include xvolkeys to the build
-#
-if [ $xvolkeys = yes ]; then
-	subdirs="$subdirs xvolkeys"
-fi 
-
 for f in Makefile aucat/Makefile sndiod/Makefile \
 libsndio/Makefile sndioctl/Makefile xvolkeys/Makefile \
 examples/Makefile \
@@ -197,7 +185,7 @@ do
 	-e "s:@vars@:${vars}:" \
 	-e "s:@precision@:$precision:" \
 	-e "s:@user@:$user:" \
-	-e "s:@subdirs@:$subdirs:" \
+	-e "s:@xvolkeys@:$xvolkeys:" \
 	< $f.in > $f
 done