# -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.28 2003/05/29 13:36:39 simonmar Exp $
+# $Id: package.mk,v 1.38 2004/03/27 09:57:58 panne 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.
PKGCONF_CPP_EXTRA_OPTS =
endif
-ifeq "$(STANDALONE_PACKAGE)" "NO"
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 $(PKGCONF_CPP_EXTRA_OPTS) -x c $(PACKAGE_CPP_OPTS) $< | \
+ 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 $(PKGCONF_CPP_EXTRA_OPTS) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< | \
+ 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
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
- pkglibdir=$(libdir) $(GHC_PKG) --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)
LIBRARY = libHS$(PACKAGE)$(_way).a
-WAYS = $(GhcLibWays)
+ifeq "$(WAYS)" ""
+WAYS = $(GhcLibWays)
+endif
all :: $(LIBRARY)
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)" ""
$(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