--- a/components/Makefile	Tue May 10 23:37:02 2011 +0100
+++ b/components/Makefile	Tue May 10 17:39:30 2011 -0700
@@ -38,6 +38,16 @@
 
 -include components.mk
 
+# depends.mk is auto-generated by concatenating 'depend.mk' files in each
+# component directory.
+depends.mk:     components.mk
+	@echo "Generating component dependencies..."
+	@cat $(shell $(BASS_O_MATIC) --workspace=$(WS_TOP) --components=paths \
+		| sed -e 's;^$(shell pwd)/;;g' -e 's;$$;/depend.mk;g') >$@ \
+		2>/dev/null
+ 
+-include depends.mk
+
 
 download:		TARGET = download
 prep:			TARGET = prep
@@ -117,13 +127,4 @@
 	 $(BASS_O_MATIC) $(TEMPLATE_ZONE:%=--template-zone %) \
 			 $(@:%.nosetup=--component %) --make $(TARGET) $(LOG)
 
-# depends.mk is auto-generated by the build tools, bass-o-matic.py in particular
-depends.mk:	components.mk
-	@echo "Generating component dependencies..."
-	@$(BASS_O_MATIC) --workspace=$(WS_TOP) --components=depend \
-		| sed -e 's;$(shell pwd)/;;g' >$@
-
-# skip dependency generation until we have a new solution for it.
-#-include depends.mk
-
 FORCE: