# -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.15 2002/07/02 08:41:28 simonmar Exp $
+# $Id: package.mk,v 1.20 2002/12/12 13:28:35 simonmar Exp $
ifneq "$(PACKAGE)" ""
$(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.
+#
+# The stamp file goes in $(GHC_DRIVER_DIR), so that if someone happens
+# to 'make clean' in ghc without cleaning in libraries too, the packages
+# will be correctly re-installed.
+#
+STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE)
+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) == ""
HTML_DOC = $(HTML_DIR)/index.html
ifneq "$(HS_PPS)" ""
+
+ifeq "$(HADDOCK)" ""
+html ::
+ @echo Haddock must be installed in order to build HTML library documentation.
+ @echo Please install Haddock and re-configure.
+ @exit 1
+endif
+
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)
echo $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/$(PACKAGE); \
$(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/$(PACKAGE); \
done
+ $(INSTALL_DATA) $(INSTALL_OPTS) $(PACKAGE).haddock $(datadir)/html/$(PACKAGE)
endif # HS_PPS
endif # NO_HADDOCK_DOCS