X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=b5fce7c60d9955d17782fe120f2fd8053ce473b5;hb=04f38ebf110bdf6808198b429e491501af869d11;hp=ed0ceb6d19e6efa3e2d8a0ffd3630f749e8587fd;hpb=bb09f8d3762733a810d7200a8c026b6c1c71a2da;p=ghc-hetmet.git diff --git a/mk/package.mk b/mk/package.mk index ed0ceb6..b5fce7c 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -1,33 +1,89 @@ # ----------------------------------------------------------------------------- -# $Id: package.mk,v 1.8 2002/02/17 18:38:07 panne Exp $ +# $Id: package.mk,v 1.32 2003/12/18 21:37:56 panne 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' >$@ -$(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' >$@ -boot all :: $(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 +endif + +# 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 -CLEAN_FILES += $(PACKAGE).conf.installed $(PACKAGE).conf.inplace +$(STAMP_PKG_CONF) : package.conf.inplace package.conf.installed + $(GHC_PKG_INPLACE) --update-package .a -HC = $(GHC_INPLACE) +ifeq "$(STANDALONE_PACKAGE)" "NO" +HC = $(GHC_INPLACE) +endif SRC_HSC2HS_OPTS += -I. @@ -68,30 +124,39 @@ endif # 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. -override datadir:=$(libdir)/imports/$(PACKAGE) + +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_DATAS_WITH_DIRS += $(HS_IFACES) +INSTALL_IFACES_WITH_DIRS += $(HS_IFACES) ifneq "$(ALL_DIRS)" "" install :: @for i in $(ALL_DIRS); do \ - $(INSTALL_DIR) $(datadir)/$$i; \ + $(INSTALL_DIR) $(ifacedir)/$$i; \ done endif else -INSTALL_DATAS += $(HS_IFACES) +INSTALL_IFACES += $(HS_IFACES) endif # ----------------------------------------------------------------------------- # Dependencies +ifeq "$(STANDALONE_PACKAGE)" "NO" MKDEPENDHS = $(GHC_INPLACE) -SRC_MKDEPENDC_OPTS += $(patsubst %,-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) /= "" @@ -128,10 +193,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 +# ----------------------------------------------------------------------------- +# Doc building with Haddock + +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)/haddock.css + +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 -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@ + +%.raw-hs : %.hs + $(HC) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@ + +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) /= ""