# -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.24 2003/05/16 10:14:20 simonmar Exp $
+# $Id: package.mk,v 1.27 2003/05/23 10:00:04 simonmar Exp $
ifneq "$(PACKAGE)" ""
+ifeq "$(ProjectNameShort)" "ghc"
+STANDALONE_PACKAGE = NO
+else
+STANDALONE_PACKAGE = YES
+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) $< \
+ifeq "$(STANDALONE_PACKAGE)" "NO"
+PKGCONF_CPP_EXTRA_OPTS = -I$(GHC_INCLUDE_DIR)
+else
+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
-$(PACKAGE).conf.installed : $(PACKAGE).conf.in
- $(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
+package.conf.installed : package.conf.in
+ $(CPP) $(RAWCPP_FLAGS) $(PKGCONF_CPP_EXTRA_OPTS) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
| sed 's/^#.*$$//g' >$@
# we could be more accurate here and add a dependency on
# 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 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)
-CLEAN_FILES += $(PACKAGE).conf.installed $(PACKAGE).conf.inplace
+CLEAN_FILES += package.conf.installed package.conf.inplace
+
+else # $(STANDALONE_PACKAGE) == "YES"
+
+# 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
+
+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.
# -----------------------------------------------------------------------------
# Dependencies
+ifeq "$(STANDALONE_PACKAGE)" "NO"
MKDEPENDHS = $(GHC_INPLACE)
-SRC_MKDEPENDC_OPTS += $(addprefix -I,$(ALL_DIRS)) -I$(GHC_INCLUDE_DIR)
+endif
+
+SRC_MKDEPENDC_OPTS += $(addprefix -I,$(ALL_DIRS))
+
+ifeq "$(STANDALONE_PACKAGE)" "NO"
+SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
+endif
endif # $(PACKAGE) /= ""
--read-interface=../$(pkg),../$(pkg)/$(pkg).haddock)
%.raw-hs : %.lhs
- $(GHC_INPLACE) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
+ $(GHC) $(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 >$@
+ $(GHC) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
install-docs :: $(HTML_DOC)
@$(INSTALL_DIR) $(datadir)/html/$(PACKAGE)