X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fpackage.mk;h=da3bed9fa00e048b7ee8c707e69cf9cfa2b33a33;hp=6dff1d87edc78880f82b0424f9948e58cca46da4;hb=e11c0f8efedcd6920bc77b105f6053520f85e3a0;hpb=31976c6693526d1231a2b0c7e8c07887d43ddb1f diff --git a/mk/package.mk b/mk/package.mk index 6dff1d8..da3bed9 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -1,33 +1,93 @@ # ----------------------------------------------------------------------------- -# $Id: package.mk,v 1.11 2002/06/20 16:03:19 simonmar Exp $ +# $Id: package.mk,v 1.40 2004/11/03 12:31:42 ross 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. ifeq "$(way)" "" -$(PACKAGE).conf.inplace : $(PACKAGE).conf.in - $(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -x c $(PACKAGE_CPP_OPTS) $< \ - | sed 's/^#.*$$//g' >$@ +ifeq "$(STANDALONE_PACKAGE)" "NO" +PKGCONF_CPP_EXTRA_OPTS = -I$(GHC_INCLUDE_DIR) +else +PKGCONF_CPP_EXTRA_OPTS = +endif + +package.conf.inplace : package.conf.in + $(CPP) $(RAWCPP_FLAGS) -P $(PKGCONF_CPP_EXTRA_OPTS) -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) -P $(PKGCONF_CPP_EXTRA_OPTS) -DINSTALLING -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 +# 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" -$(PACKAGE).conf.installed : $(PACKAGE).conf.in - $(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \ - | sed 's/^#.*$$//g' >$@ +STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE) +CLEAN_FILES += $(STAMP_PKG_CONF) + +ifneq "$(BootingFromHc)" "YES" +boot all :: $(STAMP_PKG_CONF) +endif + +$(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. @@ -39,7 +99,9 @@ endif LIBRARY = libHS$(PACKAGE)$(_way).a -WAYS = $(GhcLibWays) +ifeq "$(WAYS)" "" +WAYS = $(GhcLibWays) +endif all :: $(LIBRARY) @@ -69,7 +131,11 @@ endif # The interface files are put inside the $(libdir), since they # might (potentially) be platform specific.. -ifacedir = $(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. @@ -88,8 +154,15 @@ endif # ----------------------------------------------------------------------------- # 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) /= "" @@ -135,31 +208,56 @@ 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)/index.html +HTML_DOC = $(HTML_DIR)/haddock.css $(HTML_DIR)/haddock.js 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) -$(HTML_DOC) : $(HS_PPS) $(HADDOCK_INPLACE) +extraclean :: + $(RM) -rf $(HTML_DIR) + +$(HTML_DOC) : $(HS_PPS) @$(INSTALL_DIR) $(HTML_DIR) - $(HADDOCK_INPLACE) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS) + $(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 \ - $(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/libraries/$(PACKAGE) endif # HS_PPS +endif # NO_HADDOCK_DOCS # -----------------------------------------------------------------------------