X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fhaddock.mk;h=67286f58207b4c4dd3e28547c22547afd9dcca05;hb=ade62f7f53c1e8723211b7bf77b7399d24fe65e3;hp=8c5f00ac4c132d3b56f12cfd9ee2c5ddb21410b0;hpb=5d6bfce45fab55d839748383d97cdd7eba7b809e;p=ghc-hetmet.git

diff --git a/rules/haddock.mk b/rules/haddock.mk
index 8c5f00a..67286f5 100644
--- a/rules/haddock.mk
+++ b/rules/haddock.mk
@@ -11,7 +11,7 @@
 # -----------------------------------------------------------------------------
 
 
-define haddock  # args: $1 = dir,  $2 = distdir, $3 = way
+define haddock  # args: $1 = dir,  $2 = distdir
 
 ifneq "$$($1_$2_DO_HADDOCK)" "NO"
 
@@ -21,7 +21,9 @@ else
 $$(error Already got a haddock file for $$($1_PACKAGE))
 endif
 
-ifeq "HADDOCK_DOCS" "YES"
+haddock: $$($$($1_PACKAGE)_HADDOCK_FILE)
+
+ifeq "$$(HADDOCK_DOCS)" "YES"
 $(call all-target,$1_$2_haddock,$$($$($1_PACKAGE)_HADDOCK_FILE))
 endif
 
@@ -31,9 +33,13 @@ ifeq "$$(HSCOLOUR_SRCS)" "YES"
 $1_$2_HADDOCK_FLAGS += --hyperlink-source
 endif
 
-$$($$($1_PACKAGE)_HADDOCK_FILE) : $$(MKDIRHIER) $(INPLACE_BIN)/haddock$(exeext) $$(GHC_CABAL_INPLACE) $$($1_$2_HS_SRCS) $$($$($1_PACKAGE)_HADDOCK_DEPS)
-	$$(MKDIRHIER) $$(dir $$@)
-	$$(GHC_CABAL_INPLACE) haddock $2 $1 --with-haddock=$$(TOP)/$(INPLACE_BIN)/haddock --with-ghc=$$(TOP)/$(INPLACE_BIN)/ghc-stage2 $$($1_$2_HADDOCK_FLAGS) $$($1_$2_HADDOCK_OPTS)
+$$($$($1_PACKAGE)_HADDOCK_FILE) : $$(MKDIRHIER) $$(INPLACE_BIN)/haddock$$(exeext) $$(GHC_CABAL_INPLACE) $$($1_$2_HS_SRCS) $$($$($1_PACKAGE)_HADDOCK_DEPS)
+	"$$(MKDIRHIER)" $$(dir $$@)
+	"$$(GHC_CABAL_INPLACE)" haddock $2 $1 --with-haddock=$$(TOP)/$$(INPLACE_BIN)/haddock --with-ghc=$$(TOP)/$$(INPLACE_BIN)/ghc-stage2 $$($1_$2_HADDOCK_FLAGS) $$($1_$2_HADDOCK_OPTS)
+
+# Make the haddocking depend on the library .a file, to ensure
+# that we wait until the library is fully build before we haddock it
+$$($$($1_PACKAGE)_HADDOCK_FILE) : $$($1_$2_v_LIB)
 
 endif