# -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.37 2004/02/24 15:51:33 simonmar Exp $
+# $Id: package.mk,v 1.55 2005/05/13 10:05:33 krasimir Exp $
ifneq "$(PACKAGE)" ""
-ifeq "$(STANDALONE_PACKAGE)" ""
-ifeq "$(ProjectNameShort)" "ghc"
-STANDALONE_PACKAGE = NO
+# -----------------------------------------------------------------------------
+# Directory layouts, installation etc.
+
+# Here Windows & Unix differ. On Windows, the value of $(prefix) is known
+# to the compiler, and spliced into package.conf in place of $topdir at
+# runtime.
+#
+# On Unix, we only use absolute paths in package.conf.
+#
+
+ifeq "$(Windows)" "YES"
+
+PKG_LIBDIR = $$topdir
+PKG_DATADIR = $$topdir
+
else
-STANDALONE_PACKAGE = YES
-endif
-endif
+
+PKG_LIBDIR = $(libdir)
+PKG_DATADIR = $(datadir)
+
+endif # Unix
+
+IMPORT_DIR_INSTALLED = $(PKG_LIBDIR)/imports
+IMPORT_DIR_INPLACE = $(FPTOOLS_TOP_ABS)/libraries/$(PACKAGE)
+
+INCLUDE_DIR_INSTALLED = $(PKG_LIBDIR)/include
+INCLUDE_DIR_INPLACE = $(FPTOOLS_TOP_ABS)/libraries/$(PACKAGE)/include
+
+LIB_DIR_INSTALLED = $(PKG_LIBDIR)
+LIB_DIR_INPLACE = $(FPTOOLS_TOP_ABS)/libraries/$(PACKAGE)
+
+DATA_DIR_INSTALLED = $(PKG_DATADIR)
+DATA_DIR_INPLACE = $(FPTOOLS_TOP_ABS)/libraries/$(PACKAGE)
+
+HTML_DIR_INPLACE = $(FPTOOLS_TOP_ABS)/libraries/$(PACKAGE)/html
+HTML_DIR_INSTALLED = $(PKG_DATADIR)/html/libraries/$(PACKAGE)
+
+HADDOCK_IFACE_INPLACE = $(HTML_DIR_INPLACE)/$(PACKAGE).haddock
+HADDOCK_IFACE_INSTALLED = $(HTML_DIR_INSTALLED)/$(PACKAGE).haddock
# -----------------------------------------------------------------------------
# Build the package configuration file and tell the compiler about it.
+# We want to build two versions of the package configuration: one for use
+# in the
+
ifeq "$(way)" ""
-ifeq "$(STANDALONE_PACKAGE)" "NO"
-PKGCONF_CPP_EXTRA_OPTS = -I$(GHC_INCLUDE_DIR)
-else
-PKGCONF_CPP_EXTRA_OPTS =
-endif
+PACKAGE_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -Iinclude
-package.conf.inplace : package.conf.in
- $(CPP) $(RAWCPP_FLAGS) -P $(PKGCONF_CPP_EXTRA_OPTS) -x c $(PACKAGE_CPP_OPTS) $< | \
- sed -e 's/""//g' -e 's/\[ *,/[ /g' >$@
+PACKAGE_CPP_OPTS += -DPACKAGE=${PACKAGE}
+PACKAGE_CPP_OPTS += -DVERSION=${VERSION}
-package.conf.installed : package.conf.in
- $(CPP) $(RAWCPP_FLAGS) -P $(PKGCONF_CPP_EXTRA_OPTS) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< | \
- sed -e 's/""//g' -e 's/\[ *,/[ /g' >$@
+PACKAGE_CPP_OPTS += -DPKG_LIBDIR='"$(PKG_LIBDIR)"'
+PACKAGE_CPP_OPTS += -DPKG_DATADIR='"$(PKG_DATADIR)"'
+
+package.conf.inplace : package.conf.in
+ $(CPP) $(RAWCPP_FLAGS) -P \
+ -DIMPORT_DIR='"$(IMPORT_DIR_INPLACE)"' \
+ -DLIB_DIR='"$(LIB_DIR_INPLACE)"' \
+ -DINCLUDE_DIR='"$(INCLUDE_DIR_INPLACE)"' \
+ -DDATA_DIR='"$(DATA_DIR_INPLACE)"' \
+ -DHTML_DIR='"$(HTML_DIR_INPLACE)"' \
+ -DHADDOCK_IFACE='"$(HADDOCK_IFACE_INPLACE)"' \
+ -DFPTOOLS_TOP_ABS='"${FPTOOLS_TOP_ABS}"' \
+ -x c $(PACKAGE_CPP_OPTS) $< | \
+ grep -v '^#pragma GCC' | \
+ sed -e 's/""//g' -e 's/:[ ]*,/: /g' >$@
+
+install::
+ $(CPP) $(RAWCPP_FLAGS) -P -DINSTALLING \
+ -DIMPORT_DIR='"$(IMPORT_DIR_INSTALLED)"' \
+ -DLIB_DIR='"$(LIB_DIR_INSTALLED)"' \
+ -DINCLUDE_DIR='"$(INCLUDE_DIR_INSTALLED)"' \
+ -DDATA_DIR='"$(DATA_DIR_INSTALLED)"' \
+ -DHTML_DIR='"$(HTML_DIR_INSTALLED)"' \
+ -DHADDOCK_IFACE='"$(HADDOCK_IFACE_INSTALLED)"' \
+ -I../includes \
+ -x c $(PACKAGE_CPP_OPTS) package.conf.in \
+ | grep -v '^#pragma GCC' \
+ | sed -e 's/""//g' -e 's/:[ ]*,/: /g' \
+ | $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)/ghc-pkg-inplace --global-conf $(DESTDIR)$(libdir)/package.conf update - --force
# we could be more accurate here and add a dependency on
-# ghc/driver/package.conf, but that doesn't work too well because of
+# 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
# 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)
boot all :: $(STAMP_PKG_CONF)
endif
-$(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
+$(STAMP_PKG_CONF) : package.conf.inplace
+ $(GHC_PKG_INPLACE) update - --force-files <package.conf.inplace
@touch $(STAMP_PKG_CONF)
-CLEAN_FILES += package.conf.installed package.conf.inplace
-
-else # $(STANDALONE_PACKAGE) == "YES"
-
-PACKAGE_CPP_OPTS += -DPACKAGE=\"${PACKAGE}\"
-PACKAGE_CPP_OPTS += -DPACKAGE_DEPS='$(patsubst %,"%"$(comma),$(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)
+CLEAN_FILES += package.conf.inplace
endif # $(way) == ""
# -----------------------------------------------------------------------------
# Building the static library libHS<pkg>.a
-ifeq "$(STANDALONE_PACKAGE)" "NO"
+SRC_HSC2HS_OPTS += -I.
+
+ifneq "$(NO_SET_HC)" "YES"
HC = $(GHC_INPLACE)
endif
-
-SRC_HSC2HS_OPTS += -I.
+IGNORE_PACKAGE_FLAG = -package-name $(PACKAGE)-$(VERSION)
ifeq "$(NON_HS_PACKAGE)" ""
-SRC_HC_OPTS += -package-name $(PACKAGE)
+SRC_HC_OPTS += $(IGNORE_PACKAGE_FLAG)
SRC_HC_OPTS += $(GhcLibHcOpts)
SRC_HC_OPTS += $(patsubst %, -package %, $(PACKAGE_DEPS))
endif
+# -fgenerics switches on generation of support code for
+# derivable type classes. This is now off by default,
+# but we switch it on for the libraries so that we generate
+# the code in case someone importing wants it.
+ifeq "$(NON_HS_PACKAGE)" ""
+SRC_HC_OPTS += -fgenerics
+endif
+
+ifndef LIBRARY
+ifeq "$(_way:%_dyn=YES)" "YES"
+LIBRARY = libHS$(PACKAGE)$(_way:%_dyn=%)-ghc$(ProjectVersion)$(soext)
+else
LIBRARY = libHS$(PACKAGE)$(_way).a
+endif
+endif
ifeq "$(WAYS)" ""
WAYS = $(GhcLibWays)
# -----------------------------------------------------------------------------
# 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) /= ""
+endif # $(PACKAGE) != ""
+
+#--------------------------------------------------------------
+# Installation
-# install library (could be implicitly specified or explicitly, like libHS*_cbits.a)
-INSTALL_LIBS += $(LIBRARY)
+ifneq "$(NO_INSTALL_LIBRARY)" "YES"
+INSTALL_LIBS += $(LIBRARY) $(GHCI_LIBRARY)
+endif
#--------------------------------------------------------------
# Building dynamically-linkable libraries for GHCi
ifeq "$(way)" ""
ifeq "$(GhcWithInterpreter)" "YES"
+ifndef GHCI_LIBRARY
GHCI_LIBRARY = $(patsubst lib%.a,%.o,$(LIBRARY))
+endif
-INSTALL_LIBS += $(GHCI_LIBRARY)
CLEAN_FILES += $(GHCI_LIBRARY)
all :: $(GHCI_LIBRARY)
endif # DONT_WANT_STD_GHCI_LIB_RULE
endif # GhcWithInterpreter
endif # way
+endif # $(LIBRARY) /= ""
# -----------------------------------------------------------------------------
# Doc building with Haddock
-ifneq "$(NO_HADDOCK_DOCS)" "YES"
+ifneq "$(PACKAGE)" ""
+ifeq "$(HADDOCK_DOCS)" "YES"
-HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
+HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS)))) $(EXTRA_HADDOCK_SRCS)
-HTML_DIR = html
-HTML_DOC = $(HTML_DIR)/haddock.css
+HTML_DIR = ../html-docs/$(PACKAGE)
+HTML_DOC = $(HTML_DIR)/haddock.css $(HTML_DIR)/haddock.js
ifneq "$(HS_PPS)" ""
extraclean ::
$(RM) -rf $(HTML_DIR)
+ifneq "$(findstring $(PACKAGE), $(CorePackages))" ""
+HaddockSourceURL = $(CorePackageSourceURL)
+else
+HaddockSourceURL = $(ExtraPackageSourceURL)
+endif
+
$(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 \
+ --source-module=$(HaddockSourceURL) \
$(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 $@
+ $(HC) $(HC_OPTS) -D__HADDOCK__ -E $< -o $@
%.raw-hs : %.hs
- $(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@
+ $(HC) $(HC_OPTS) -D__HADDOCK__ -E $< -o $@
+
+HTML_INSTALL_DIR = $(DESTDIR)$(htmldir)/libraries/html/$(PACKAGE)
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)
+ @$(INSTALL_DIR) $(HTML_INSTALL_DIR)
+ for i in $(HTML_DIR)/*; do \
+ echo $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(HTML_INSTALL_DIR); \
+ $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(HTML_INSTALL_DIR); \
+ done; \
+ $(INSTALL_DATA) $(INSTALL_OPTS) $(PACKAGE).haddock $(HTML_INSTALL_DIR); \
endif # HS_PPS
-endif # NO_HADDOCK_DOCS
+endif # HADDOCK_DOCS
+endif # $(PACKAGE) /= ""
# -----------------------------------------------------------------------------
-endif # $(LIBRARY) /= ""