X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=a43e29bd38174f3af437d212436c2fe15c8d9c88;hb=f34c83b2a4a153ced933b605dd522dfa07ec5a53;hp=60e80ed447833ca546a905b23727c66f8f1609f0;hpb=a9b5b6a32ddecabff442635dca93b003f0c17779;p=ghc-hetmet.git

diff --git a/mk/package.mk b/mk/package.mk
index 60e80ed..a43e29b 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.6 2002/02/17 13:46:39 panne Exp $
+# $Id: package.mk,v 1.16 2002/07/23 10:12:01 simonmar Exp $
 
 ifneq "$(PACKAGE)" ""
 
@@ -13,7 +13,7 @@ $(PACKAGE).conf.inplace   : $(PACKAGE).conf.in
 		| sed 's/^#.*$$//g' >$@
 
 $(PACKAGE).conf.installed : $(PACKAGE).conf.in
-	$(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -DINSTALLED -x c $(PACKAGE_CPP_OPTS) $< \
+	$(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
 		| sed 's/^#.*$$//g' >$@
 
 boot all :: $(PACKAGE).conf.inplace $(PACKAGE).conf.installed
@@ -61,8 +61,6 @@ all :: $(LIBRARY)
 # -----------------------------------------------------------------------------
 # Installation; need to install .hi files as well as libraries
 
-INSTALL_LIBS  += $(LIBRARY)
-
 ifeq "$(DLLized)" "YES"
 INSTALL_PROGS += $(DLL_NAME)
 INSTALL_LIBS += $(patsubst %.a,%_imp.a, $(LIBRARY))
@@ -70,33 +68,34 @@ endif
 
 # The interface files are put inside the $(libdir), since they
 # might (potentially) be platform specific..
-#
-# override is used here because for binary distributions, datadir is
-# set on the command line. sigh.
-override datadir:=$(libdir)/imports/$(PACKAGE)
+
+ifacedir = $(libdir)/imports/$(PACKAGE)
 
 # If the lib consists of a hierachy of modules, we must retain the directory
 # structure when we install the interfaces.
 ifeq "$(HIERARCHICAL_LIB)" "YES"
-INSTALL_DATAS_WITH_DIRS += $(HS_IFACES)
+INSTALL_IFACES_WITH_DIRS += $(HS_IFACES)
 ifneq "$(ALL_DIRS)" ""
 install ::
 	@for i in $(ALL_DIRS); do \
-		$(INSTALL_DIR) $(datadir)/$$i; \
+		$(INSTALL_DIR) $(ifacedir)/$$i; \
 	done
 endif
 else
-INSTALL_DATAS += $(HS_IFACES)
+INSTALL_IFACES += $(HS_IFACES)
 endif
 
 # -----------------------------------------------------------------------------
 # Dependencies
 
 MKDEPENDHS = $(GHC_INPLACE)
-SRC_MKDEPENDC_OPTS += $(patsubst %,-I%,$(ALL_DIRS)) -I$(GHC_INCLUDE_DIR)
+SRC_MKDEPENDC_OPTS += $(addprefix -I,$(ALL_DIRS)) -I$(GHC_INCLUDE_DIR)
 
 endif # $(PACKAGE) /= ""
 
+# install library (could be implicitly specified or explicitly, like libHS*_cbits.a)
+INSTALL_LIBS  += $(LIBRARY)
+
 #--------------------------------------------------------------
 # Building dynamically-linkable libraries for GHCi
 #
@@ -127,10 +126,48 @@ ifneq "$(DONT_WANT_STD_GHCI_LIB_RULE)" "YES"
 # when we can use a "fixed" ld.
 #
 $(GHCI_LIBRARY) : $(LIBOBJS)
-	$(LD) -r $(LD_X) -o $@ $(LIBOBJS)
+	$(LD) -r $(LD_X) -o $@ $(STUBOBJS) $(LIBOBJS)
 
 endif # DONT_WANT_STD_GHCI_LIB_RULE
 endif # GhcWithInterpreter
 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
+HTML_DOC = $(HTML_DIR)/index.html
+
+ifneq "$(HS_PPS)" ""
+html :: $(HTML_DOC)
+
+$(HTML_DOC) : $(HS_PPS)
+	@$(INSTALL_DIR) $(HTML_DIR)
+	$(HADDOCK) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS) \
+		--dump-interface=$(PACKAGE).haddock \
+		$(foreach pkg, $(PACKAGE_DEPS), \
+		   --read-interface=../$(pkg),../$(pkg)/$(pkg).haddock)
+
+%.raw-hs : %.lhs
+	$(GHC_INPLACE) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
+
+%.raw-hs : %.hs
+	$(GHC_INPLACE) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
+
+install-docs :: $(HTML_DOC)
+	@$(INSTALL_DIR) $(datadir)/html/$(PACKAGE)
+	@for i in $(HTML_DIR)/*; do \
+	   echo $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/$(PACKAGE); \
+	   $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/$(PACKAGE); \
+	done
+
+endif # HS_PPS
+endif # NO_HADDOCK_DOCS
+
+# -----------------------------------------------------------------------------
+
 endif # $(LIBRARY) /= ""