[project @ 2005-01-10 16:24:16 by simonmar]

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

diff --git a/mk/package.mk b/mk/package.mk
index 4d3d257..bff2772 100644 (file)
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,13 +1,15 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.29 2003/05/29 14:47:05 reid Exp $
+# $Id: package.mk,v 1.42 2004/11/26 16:22:13 simonmar 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.
@@ -15,20 +17,35 @@ endif
 ifeq "$(way)" ""
 
 ifeq "$(STANDALONE_PACKAGE)" "NO"
-PKGCONF_CPP_EXTRA_OPTS = -I$(GHC_INCLUDE_DIR)
+PACKAGE_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -Iinclude
 else
-PKGCONF_CPP_EXTRA_OPTS =
+PACKAGE_CPP_OPTS += -Iinclude
 endif
 
-ifeq "$(STANDALONE_PACKAGE)" "NO"
+PACKAGE_CPP_OPTS += -DPACKAGE=${PACKAGE}
+PACKAGE_CPP_OPTS += -DVERSION=${VERSION}
+
+IMPORT_DIR_INSTALLED = $$libdir/imports
+IMPORT_DIR_INPLACE   = $$libdir/libraries/$(PACKAGE)
+
+LIB_DIR_INSTALLED    = $$libdir
+LIB_DIR_INPLACE             = $$libdir/libraries/$(PACKAGE)
+
 package.conf.inplace   : package.conf.in
-       $(CPP) $(RAWCPP_FLAGS) $(PKGCONF_CPP_EXTRA_OPTS) -x c $(PACKAGE_CPP_OPTS) $< \
-               | sed 's/^#.*$$//g' >$@
-endif
+       $(CPP) $(RAWCPP_FLAGS) -P \
+               -DIMPORT_DIR='"$(IMPORT_DIR_INPLACE)"' \
+               -DLIB_DIR='"$(LIB_DIR_INPLACE)"' \
+               -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) $(PKGCONF_CPP_EXTRA_OPTS) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
-               | sed 's/^#.*$$//g' >$@
+       $(CPP) $(RAWCPP_FLAGS) -P -DINSTALLING \
+               -DIMPORT_DIR='"$(IMPORT_DIR_INSTALLED)"' \
+               -DLIB_DIR='"$(LIB_DIR_INSTALLED)"' \
+                -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
@@ -59,12 +76,21 @@ CLEAN_FILES += package.conf.installed package.conf.inplace
 
 else # $(STANDALONE_PACKAGE) == "YES"
 
+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
-       pkglibdir=$(libdir) $(GHC_PKG) --force --update-package <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)
 
@@ -80,14 +106,16 @@ endif
 SRC_HSC2HS_OPTS += -I.
 
 ifeq "$(NON_HS_PACKAGE)" ""
-SRC_HC_OPTS    += -package-name $(PACKAGE)
+SRC_HC_OPTS    += -ignore-package $(PACKAGE)
 SRC_HC_OPTS    += $(GhcLibHcOpts)
 SRC_HC_OPTS     += $(patsubst %, -package %, $(PACKAGE_DEPS))
 endif
 
 LIBRARY        = libHS$(PACKAGE)$(_way).a
 
-WAYS           = $(GhcLibWays)
+ifeq "$(WAYS)" ""
+WAYS = $(GhcLibWays)
+endif
 
 all :: $(LIBRARY)
 
@@ -199,7 +227,7 @@ 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
+HTML_DOC = $(HTML_DIR)/haddock.css $(HTML_DIR)/haddock.js
 
 ifneq "$(HS_PPS)" ""
 
@@ -220,25 +248,27 @@ extraclean ::
 $(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
-       $(GHC) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
+       $(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@
 
 %.raw-hs : %.hs
-       $(GHC) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
+       $(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@
 
 install-docs :: $(HTML_DOC)
-       @$(INSTALL_DIR) $(datadir)/html/$(PACKAGE)
+       @$(INSTALL_DIR) $(datadir)/html/libraries/$(PACKAGE)
        @for i in $(HTML_DIR)/*; do \
-          echo $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/$(PACKAGE); \
-          $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/$(PACKAGE); \
+          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/$(PACKAGE)
+       $(INSTALL_DATA) $(INSTALL_OPTS) $(PACKAGE).haddock $(datadir)/html/libraries/$(PACKAGE)
 
 endif # HS_PPS
 endif # NO_HADDOCK_DOCS