diff --git a/Makefile b/Makefile
index 6ce9f3abd..4ab668a5e 100644
--- a/Makefile
+++ b/Makefile
@@ -52,22 +52,23 @@ docs: haddock-with-source hoogleweb api-doc-frames
api-doc-dir:
mkdir -p api-doc
-haddock: api-doc-dir $(MAIN)
+api-doc: api-doc-dir $(MAIN)
echo "Generating haddock api docs" ; \
haddock --no-warnings --ignore-all-exports -B `ghc --print-libdir` -o api-doc -h $(filter-out %api-doc-dir,$^) ; \
cp api-doc/index.html api-doc/modules-index.html
-haddock-with-source: api-doc-dir colourised-source $(MAIN)
+api-doc-with-source: api-doc-dir colourised-source $(MAIN)
echo "Generating haddock api docs" ; \
haddock --no-warnings --ignore-all-exports -B `ghc --print-libdir` -o api-doc -h --source-module=src-%{MODULE/./-}.html --source-entity=src-%{MODULE/./-}.html#%N $(filter-out %api-doc-dir colourised-source,$^) ; \
cp api-doc/index.html api-doc/modules-index.html
-# convert haddock output to a rough but useful frame layout. Run after haddock.
-# if frames.html includes a hoogle pane, ensure the hoogle cgi is built with base target "main"
-api-doc-frames:
+# munge haddock and hoogle into a rough but useful framed layout
+# ensure that the hoogle cgi is built with base target "main"
+api-doc-frames: api-doc-with-source hoogleweb
echo "Converting api docs to frames" ; \
sed -i -e 's%^>