--- a/maxious-canberra-transit-feed/Makefile
+++ b/maxious-canberra-transit-feed/Makefile
@@ -3,20 +3,16 @@
 cbrfeed.zip: cbrtable.yml createfeed.py
 	./createfeed.py --input=cbrtable.yml --output=cbrfeed.zip
 
-ROUTE_FILES=900-intertown.yml 
-
-cbrtable.yml: cbrtable.yml.in $(ROUTE_FILES) indent-route.pl
+cbrtable.yml: cbrtable.yml.in indent-route.pl
 	cp cbrtable.yml.in cbrtable.yml
-	@$(foreach ROUTE_FILE, $(ROUTE_FILES), 	\
+	@$(foreach ROUTE_FILE, $(wildcard output/*),  \
 		echo "Parsing $(ROUTE_FILE)"; \
 		echo "TODO: replace friendly timing spot names with OSM node IDs or geohash in $(ROUTE_FILE)"; \
 		echo "TODO: add inbetween stops in $(ROUTE_FILE)"; \
-		./indent-route.pl < $(ROUTE_FILE) >> cbrtable.yml;)
+	./indent-route.pl < $(ROUTE_FILE) >> cbrtable.yml;)
 
 cbrtable.yml.in: cbrtable.yml.in.in
-	@echo "TODO: autogenerate stops via database, convert to YAML"
-	cp cbrtable.yml.in.in cbrtable.yml.in
-	
+	ruby 04-generateymlinclude.rb	
 
 clean:
 	rm -f cbrtable.yml cbrtable.yml.in cbrfeed.zip *~