[project @ 2002-09-18 06:34:07 by mthomas]

[ghc-hetmet.git] / mk / package.mk

diff --git a/mk/package.mk b/mk/package.mk
index 726f4b5..320c22a 100644 (file)
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.14 2002/07/01 15:16:33 simonmar Exp $
+# $Id: package.mk,v 1.17 2002/07/23 11:23:55 simonmar Exp $
 
 ifneq "$(PACKAGE)" ""
 
@@ -16,11 +16,24 @@ $(PACKAGE).conf.installed : $(PACKAGE).conf.in
        $(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
                | sed 's/^#.*$$//g' >$@
 
-boot all :: $(PACKAGE).conf.inplace $(PACKAGE).conf.installed
+# we could be more accurate here and add a dependency on
+# ghc/driver/package.conf, but that doesn't work too well because of
+# make's limited accuracy with modification times: when doing 'make
+# boot' in multiple packages, make won't detect that the package
+# configuration needs updating if it was updated already in the last
+# second.
+#
+STAMP_PKG_CONF = stamp-pkg-conf
+CLEAN_FILES += $(STAMP_PKG_CONF)
+
+boot all :: $(STAMP_PKG_CONF)
+
+$(STAMP_PKG_CONF) : $(PACKAGE).conf.inplace $(PACKAGE).conf.installed
        $(GHC_PKG_INPLACE) --update-package <$(PACKAGE).conf.inplace
        $(GHC_PKG_INPLACE)  -f $(GHC_DRIVER_DIR)/package.conf --update-package <$(PACKAGE).conf.installed
+       @touch $(STAMP_PKG_CONF)
 
-CLEAN_FILES += $(PACKAGE).conf.installed $(PACKAGE).conf.inplace
+CLEAN_FILES += $(PACKAGE).conf.installed $(PACKAGE).conf.inplace 
 
 endif # $(way) == ""
 
@@ -135,6 +148,8 @@ endif # way
 # -----------------------------------------------------------------------------
 # Doc building with Haddock
 
+ifneq "$(NO_HADDOCK_DOCS)" "YES"
+
 HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
 
 HTML_DIR = html
@@ -143,9 +158,9 @@ HTML_DOC = $(HTML_DIR)/index.html
 ifneq "$(HS_PPS)" ""
 html :: $(HTML_DOC)
 
-$(HTML_DOC) : $(HS_PPS) $(HADDOCK_INPLACE)
+$(HTML_DOC) : $(HS_PPS)
        @$(INSTALL_DIR) $(HTML_DIR)
-       $(HADDOCK_INPLACE) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS) \
+       $(HADDOCK) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS) \
                --dump-interface=$(PACKAGE).haddock \
                $(foreach pkg, $(PACKAGE_DEPS), \
                   --read-interface=../$(pkg),../$(pkg)/$(pkg).haddock)
@@ -164,6 +179,7 @@ install-docs :: $(HTML_DOC)
        done
 
 endif # HS_PPS
+endif # NO_HADDOCK_DOCS
 
 # -----------------------------------------------------------------------------