wip: Makefile changes

isaacs · isaacs · commit 02dbdcff1695 · 2012-02-16T01:23:49.000-08:00
diff --git a/Makefile b/Makefile
@@ -124,8 +124,11 @@ out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets/
 out/doc/%: doc/%
 	cp -r $< $@
 
-out/doc/api/%.html: doc/api/%.markdown node $(apidoc_dirs) $(apiassets) tools/doctool/doctool.js
-	out/Release/node tools/doctool/doctool.js doc/template.html $< > $@
+out/doc/api/%.json: doc/api/%.markdown node $(apidoc_dirs) tools/doc/
+	out/Release/node tools/doc/generate.js --format=json $< > $@
+
+out/doc/api/%.html: doc/api/%.json node $(apidoc_dirs) $(apiassets) tools/doc/
+	out/Release/node tools/doc/generate.js --format=html --template=doc/template.html $< > $@
 
 out/doc/%:
 
