X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=22bfdd09e8edab70f558cf4125a183ea2c4b03a4;hb=311b1cdfc9b1c311cc53482c461c18cba8885b2a;hp=be54753b2c86b78e0ff6b5524ae9111798dd63c5;hpb=195774fae2d73bfc3a104e07bf29a3ea29bb020c;p=ghc-hetmet.git diff --git a/mk/package.mk b/mk/package.mk index be54753..22bfdd0 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -1,15 +1,10 @@ # ----------------------------------------------------------------------------- -# $Id: package.mk,v 1.46 2005/02/08 10:21:36 simonmar Exp $ +# $Id: package.mk,v 1.55 2005/05/13 10:05:33 krasimir Exp $ ifneq "$(PACKAGE)" "" -ifeq "$(STANDALONE_PACKAGE)" "" -ifeq "$(ProjectNameShort)" "ghc" +# FIXME: does anyone do this any more? STANDALONE_PACKAGE = NO -else -STANDALONE_PACKAGE = YES -endif -endif # ----------------------------------------------------------------------------- # Directory layouts, installation etc. @@ -86,7 +81,7 @@ package.conf.inplace : package.conf.in -DDATA_DIR='"$(DATA_DIR_INPLACE)"' \ -DHTML_DIR='"$(HTML_DIR_INPLACE)"' \ -DHADDOCK_IFACE='"$(HADDOCK_IFACE_INPLACE)"' \ - -DFPTOOLS_TOP_ABS=\"${FPTOOLS_TOP_ABS}\" \ + -DFPTOOLS_TOP_ABS='"${FPTOOLS_TOP_ABS}"' \ -x c $(PACKAGE_CPP_OPTS) $< | \ grep -v '^#pragma GCC' | \ sed -e 's/""//g' -e 's/:[ ]*,/: /g' >$@ @@ -104,7 +99,7 @@ package.conf.installed : package.conf.in 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 +# 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 @@ -124,8 +119,8 @@ boot all :: $(STAMP_PKG_CONF) endif $(STAMP_PKG_CONF) : package.conf.inplace package.conf.installed - $(GHC_PKG_INPLACE) --force --update-package .a +SRC_HSC2HS_OPTS += -I. + ifeq "$(STANDALONE_PACKAGE)" "NO" HC = $(GHC_INPLACE) -endif - -SRC_HSC2HS_OPTS += -I. +IGNORE_PACKAGE_FLAG = -package-name $(PACKAGE)-$(VERSION) +else +# Only use -ignore-package if supported by HC; i.e., ghc-6.3 and later. +# (Don't like the use of slow $(shell ..) in Makefiles, but can't see a way around it here.) +ifeq "$(strip $(GHC))" "" +IGNORE_PACKAGE_FLAG = -ignore-package $(PACKAGE) +else +# Making the assumption here that standalone packages will be using mk/config.mk:GHC +IGNORE_PACKAGE_FLAG = $(shell if (test $(GhcCanonVersion) -ge 603); then echo "-ignore-package"; else echo "-package-name"; fi) $(PACKAGE) +endif +endif # STANDALONE_PACKAGE ifeq "$(NON_HS_PACKAGE)" "" -SRC_HC_OPTS += -ignore-package $(PACKAGE) +SRC_HC_OPTS += $(IGNORE_PACKAGE_FLAG) SRC_HC_OPTS += $(GhcLibHcOpts) SRC_HC_OPTS += $(patsubst %, -package %, $(PACKAGE_DEPS)) endif @@ -174,7 +179,9 @@ ifeq "$(NON_HS_PACKAGE)" "" SRC_HC_OPTS += -fgenerics endif +ifndef LIBRARY LIBRARY = libHS$(PACKAGE)$(_way).a +endif ifeq "$(WAYS)" "" WAYS = $(GhcLibWays) @@ -228,9 +235,6 @@ else INSTALL_IFACES += $(HS_IFACES) endif -# install library (could be implicitly specified or explicitly, like libHS*_cbits.a) -INSTALL_LIBS += $(LIBRARY) - # ----------------------------------------------------------------------------- # Dependencies @@ -244,6 +248,15 @@ ifeq "$(STANDALONE_PACKAGE)" "NO" SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR) endif +endif # $(PACKAGE) != "" + +#-------------------------------------------------------------- +# Installation + +ifneq "$(NO_INSTALL_LIBRARY)" "YES" +INSTALL_LIBS += $(LIBRARY) $(GHCI_LIBRARY) +endif + #-------------------------------------------------------------- # Building dynamically-linkable libraries for GHCi # @@ -260,8 +273,13 @@ ifneq "$(LIBRARY)" "" ifeq "$(way)" "" ifeq "$(GhcWithInterpreter)" "YES" +ifndef GHCI_LIBRARY GHCI_LIBRARY = $(patsubst lib%.a,%.o,$(LIBRARY)) +endif + +ifneq "$(NO_INSTALL_LIBRARY)" "YES" INSTALL_LIBS += $(GHCI_LIBRARY) +endif CLEAN_FILES += $(GHCI_LIBRARY) @@ -308,7 +326,7 @@ DYLD_LIBRARY = $(patsubst %.a,%_dyn.dylib,$(LIBRARY)) # Note: I'm not yet sure about this, but I think it will be convenient for # users not to have to set up DYLD_LIBRARY_PATH to point to the GHC # library dir. -- Wolfgang - + $(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS) $(CC) -dynamiclib -o $@ $(STUBOBJS) $(LIBOBJS) -flat_namespace -undefined suppress -install_name `pwd`/$@ else @@ -318,22 +336,27 @@ $(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS) $(CC) -shared -o $@ $(STUBOBJS) $(LIBOBJS) endif +ifneq "$(NO_INSTALL_LIBRARY)" "YES" INSTALL_LIBS += $(DYLD_LIBRARY) +endif + CLEAN_FILES += $(DYLD_LIBRARY) all :: $(DYLD_LIBRARY) +endif # $(GhcBuildDylibs) == "YES" -endif +endif # $(LIBRARY) /= "" # ----------------------------------------------------------------------------- # Doc building with Haddock +ifneq "$(PACKAGE)" "" ifneq "$(NO_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_DIR = ../html-docs/$(PACKAGE) HTML_DOC = $(HTML_DIR)/haddock.css $(HTML_DIR)/haddock.js ifneq "$(HS_PPS)" "" @@ -352,39 +375,44 @@ html :: $(HTML_DOC) 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 = $(datadir)/html/libraries/$(PACKAGE) # NOT the same as HTML_DIR_INSTALLED when BIN_DIST is on install-docs :: $(HTML_DOC) @$(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) + 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 # $(PACKAGE) /= "" # ----------------------------------------------------------------------------- -endif # $(LIBRARY) /= "" -endif # $(PACKAGE) /= "" -