X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=da3bed9fa00e048b7ee8c707e69cf9cfa2b33a33;hb=32aabcd28583d369eb73325742ddb950bd9d6323;hp=f16cc5efd9c9e72e2e50b38a57f6f2d47f750427;hpb=70977366e35234a268bf2d95a040a0c16bf5744e;p=ghc-hetmet.git

diff --git a/mk/package.mk b/mk/package.mk
index f16cc5e..da3bed9 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,35 +1,93 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.2 2002/02/12 15:45:46 simonmar Exp $
+# $Id: package.mk,v 1.40 2004/11/03 12:31:42 ross Exp $
 
 ifneq "$(PACKAGE)" ""
 
+ifeq "$(STANDALONE_PACKAGE)" ""
+ifeq "$(ProjectNameShort)" "ghc"
+STANDALONE_PACKAGE = NO
+else
+STANDALONE_PACKAGE = YES
+endif
+endif
+
 # -----------------------------------------------------------------------------
 # Build the package configuration file and tell the compiler about it.
 
 ifeq "$(way)" ""
 
-$(PACKAGE).conf.inplace   : $(PACKAGE).conf.in
-	$(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -x c $(PACKAGE_CPP_OPTS) $< \
-		| sed 's/^#.*$$//g' >$@
+ifeq "$(STANDALONE_PACKAGE)" "NO"
+PKGCONF_CPP_EXTRA_OPTS = -I$(GHC_INCLUDE_DIR)
+else
+PKGCONF_CPP_EXTRA_OPTS =
+endif
+
+package.conf.inplace   : package.conf.in
+	$(CPP) $(RAWCPP_FLAGS) -P $(PKGCONF_CPP_EXTRA_OPTS) -x c $(PACKAGE_CPP_OPTS) $< | \
+	grep -v '^#pragma GCC' | \
+	sed -e 's/""//g' -e 's/\[ *,/[ /g' >$@
+
+package.conf.installed : package.conf.in
+	$(CPP) $(RAWCPP_FLAGS) -P $(PKGCONF_CPP_EXTRA_OPTS) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< | \
+	grep -v '^#pragma GCC' | \
+	sed -e 's/""//g' -e 's/\[ *,/[ /g' >$@
+
+# 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.
+#
+ifeq "$(STANDALONE_PACKAGE)" "NO"
+
+STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE)
+CLEAN_FILES += $(STAMP_PKG_CONF)
+
+ifneq "$(BootingFromHc)" "YES"
+boot all :: $(STAMP_PKG_CONF)
+endif
 
-$(PACKAGE).conf.installed : $(PACKAGE).conf.in
-	$(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -DINSTALLED -x c $(PACKAGE_CPP_OPTS) $< \
-		| sed 's/^#.*$$//g' >$@
+$(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)
 
-boot all :: $(PACKAGE).conf.inplace $(PACKAGE).conf.installed
-	-$(GHC_PKG_INPLACE) --remove-package $(PACKAGE)
-	$(GHC_PKG_INPLACE) --add-package <$(PACKAGE).conf.inplace
-	-$(GHC_PKG_INPLACE) -f $(GHC_DRIVER_DIR)/package.conf --remove-package $(PACKAGE)
-	$(GHC_PKG_INPLACE)  -f $(GHC_DRIVER_DIR)/package.conf --add-package <$(PACKAGE).conf.installed
+CLEAN_FILES += package.conf.installed package.conf.inplace 
 
-CLEAN_FILES += $(PACKAGE).conf.installed $(PACKAGE).conf.inplace
+else # $(STANDALONE_PACKAGE) == "YES"
+
+PACKAGE_CPP_OPTS += -DPACKAGE=\"${PACKAGE}\"
+PACKAGE_CPP_OPTS += -DPACKAGE_DEPS='$(subst " ","$(comma) ",$(patsubst %,"%",$(PACKAGE_DEPS)))'
+PACKAGE_CPP_OPTS += -DLIBRARY=\"HS$(PACKAGE)\"
+PACKAGE_CPP_OPTS += -DLIBDIR=\"$(libdir)\"
+PACKAGE_CPP_OPTS += -DFPTOOLS_TOP_ABS=\"${FPTOOLS_TOP_ABS}\"
+
+# Let the package configuration file refer to $(libdir) as
+# ${pkglibdir}.  Note we can't use ${libdir} because ghc-pkg already
+# redefines it to point to GHC's libdir (bug or feature?).
+#
+install :: package.conf.installed
+	$(GHC_PKG) --force --update-package <package.conf.installed
+
+# Invoke this rule by hand in order to use the package in-place
+install-inplace-pkg : package.conf.inplace
+	$(GHC_PKG) --force --update-package <package.conf.inplace
+
+endif # $(STANDALONE_PACKAGE)
 
 endif # $(way) == ""
 
 # -----------------------------------------------------------------------------
 # Building the static library libHS<pkg>.a
 
-HC 	     	= $(GHC_INPLACE)
+ifeq "$(STANDALONE_PACKAGE)" "NO"
+HC = $(GHC_INPLACE)
+endif
 
 SRC_HSC2HS_OPTS += -I.
 
@@ -41,7 +99,9 @@ endif
 
 LIBRARY      	= libHS$(PACKAGE)$(_way).a
 
-WAYS         	= $(GhcLibWays)
+ifeq "$(WAYS)" ""
+WAYS = $(GhcLibWays)
+endif
 
 all :: $(LIBRARY)
 
@@ -60,27 +120,72 @@ all :: $(LIBRARY)
 # %.o : %.lhs
 # 	$(GHC_INPLACE) $(HC_OPTS) --make $<
 
+# -----------------------------------------------------------------------------
+# Installation; need to install .hi files as well as libraries
+
+ifeq "$(DLLized)" "YES"
+INSTALL_PROGS += $(DLL_NAME)
+INSTALL_LIBS += $(patsubst %.a,%_imp.a, $(LIBRARY))
+endif
+
+# The interface files are put inside the $(libdir), since they
+# might (potentially) be platform specific..
+
+ifeq "$(HIERARCHICAL_LIB)" "YES"
+ifacedir = $(libdir)/imports
+else
+ifacedir = $(libdir)/hslibs-imports/$(PACKAGE)
+endif
+
+# 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_IFACES_WITH_DIRS += $(HS_IFACES)
+ifneq "$(ALL_DIRS)" ""
+install ::
+	@for i in $(ALL_DIRS); do \
+		$(INSTALL_DIR) $(ifacedir)/$$i; \
+	done
+endif
+else
+INSTALL_IFACES += $(HS_IFACES)
+endif
+
+# -----------------------------------------------------------------------------
+# Dependencies
+
+ifeq "$(STANDALONE_PACKAGE)" "NO"
+MKDEPENDHS = $(GHC_INPLACE)
+endif
+
+SRC_MKDEPENDC_OPTS += $(addprefix -I,$(ALL_DIRS))
+
+ifeq "$(STANDALONE_PACKAGE)" "NO"
+SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
+endif
+
+endif # $(PACKAGE) /= ""
+
+# install library (could be implicitly specified or explicitly, like libHS*_cbits.a)
+INSTALL_LIBS  += $(LIBRARY)
+
 #--------------------------------------------------------------
 # Building dynamically-linkable libraries for GHCi
 #
-# Build $(GHCI_LIBRARY) from $(OBJS)
+# Build $(GHCI_LIBRARY) whenever we build $(LIBRARY)
 #
 # Why?  GHCi can only link .o files (at the moment), not .a files
 # so we have to build libFoo.o as well as libFoo.a
 #
 # Furthermore, GHCi currently never loads 
 # profiling libraries (or other non-std ways)
-#
-# Inputs:
-#   $(GHCI_LIBRARY)
-#
-# Outputs:
-#   Rule to build $(GHCI_LIBRARY)
+
+ifneq "$(LIBRARY)" ""
 
 ifeq "$(way)" ""
 ifeq "$(GhcWithInterpreter)" "YES"
 
-GHCI_LIBRARY = HS$(PACKAGE)$(_cbits)$(_way).o
+GHCI_LIBRARY = $(patsubst lib%.a,%.o,$(LIBRARY))
 
 INSTALL_LIBS += $(GHCI_LIBRARY)
 CLEAN_FILES  += $(GHCI_LIBRARY)
@@ -94,29 +199,66 @@ 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
 
 # -----------------------------------------------------------------------------
-# Installation; need to install .hi files as well as libraries
-#
-# 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.
-#
+# Doc building with Haddock
 
-override datadir:=$(libdir)/imports/$(PACKAGE)
+ifneq "$(NO_HADDOCK_DOCS)" "YES"
 
-# -----------------------------------------------------------------------------
-# Dependencies
+HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
 
-MKDEPENDHS = $(GHC_INPLACE)
-SRC_MKDEPENDC_OPTS += $(patsubst %,-I%,$(ALL_DIRS)) -I$(GHC_INCLUDE_DIR)
+HTML_DIR = html
+HTML_DOC = $(HTML_DIR)/haddock.css $(HTML_DIR)/haddock.js
 
-endif # $(PACKAGE) /= ""
+ifneq "$(HS_PPS)" ""
+
+CLEAN_FILES += $(HS_PPS) $(addsuffix .tmp, $(HS_SRCS))
+
+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)
+
+extraclean :: 
+	$(RM) -rf $(HTML_DIR)
+
+$(HTML_DOC) : $(HS_PPS)
+	@$(INSTALL_DIR) $(HTML_DIR)
+	$(HADDOCK) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS) \
+		--package=$(PACKAGE) \
+		--dump-interface=$(PACKAGE).haddock \
+		--use-index=../doc-index.html --use-contents=../index.html \
+		$(foreach pkg, $(PACKAGE_DEPS), \
+		   --read-interface=../$(pkg),../$(pkg)/$(pkg).haddock)
+
+CLEAN_FILES += $(PACKAGE).haddock
+
+%.raw-hs : %.lhs
+	$(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@
+
+%.raw-hs : %.hs
+	$(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@
+
+install-docs :: $(HTML_DOC)
+	@$(INSTALL_DIR) $(datadir)/html/libraries/$(PACKAGE)
+	@for i in $(HTML_DIR)/*; do \
+	   echo $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/libraries/$(PACKAGE); \
+	   $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/libraries/$(PACKAGE); \
+	done
+	$(INSTALL_DATA) $(INSTALL_OPTS) $(PACKAGE).haddock $(datadir)/html/libraries/$(PACKAGE)
+
+endif # HS_PPS
+endif # NO_HADDOCK_DOCS
+
+# -----------------------------------------------------------------------------
 
+endif # $(LIBRARY) /= ""