X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fpackage.mk;h=29fdb99b7bbef063a5468af20b8d926cbae83ee1;hp=9e05818a76c0deb370ad00a44bc16350b455e48b;hb=fd1375dd261725eb00969a3017b924369c09835c;hpb=c0cca2ea9d9b07c6af2da1a786e1a7bd4b757d0c diff --git a/mk/package.mk b/mk/package.mk index 9e05818..29fdb99 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -1,16 +1,8 @@ # ----------------------------------------------------------------------------- -# $Id: package.mk,v 1.50 2005/03/24 18:44:16 sof Exp $ +# $Id: package.mk,v 1.55 2005/05/13 10:05:33 krasimir Exp $ ifneq "$(PACKAGE)" "" -ifeq "$(STANDALONE_PACKAGE)" "" -ifeq "$(ProjectNameShort)" "ghc" -STANDALONE_PACKAGE = NO -else -STANDALONE_PACKAGE = YES -endif -endif - # ----------------------------------------------------------------------------- # Directory layouts, installation etc. @@ -66,11 +58,7 @@ HADDOCK_IFACE_INSTALLED = $(HTML_DIR_INSTALLED)/$(PACKAGE).haddock ifeq "$(way)" "" -ifeq "$(STANDALONE_PACKAGE)" "NO" PACKAGE_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -Iinclude -else -PACKAGE_CPP_OPTS += -Iinclude -endif PACKAGE_CPP_OPTS += -DPACKAGE=${PACKAGE} PACKAGE_CPP_OPTS += -DVERSION=${VERSION} @@ -86,7 +74,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 +92,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 @@ -114,7 +102,6 @@ package.conf.installed : package.conf.in # 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) @@ -124,55 +111,26 @@ boot all :: $(STAMP_PKG_CONF) endif $(STAMP_PKG_CONF) : package.conf.inplace package.conf.installed - $(GHC_PKG_INPLACE) --force --update-package .a -ifeq "$(STANDALONE_PACKAGE)" "NO" +SRC_HSC2HS_OPTS += -I. + +ifneq "$(NO_SET_HC)" "YES" HC = $(GHC_INPLACE) endif - -SRC_HSC2HS_OPTS += -I. +IGNORE_PACKAGE_FLAG = -package-name $(PACKAGE)-$(VERSION) ifeq "$(NON_HS_PACKAGE)" "" -# 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 "$(STANDALONE_PACKAGE)" "NO" -SRC_HC_OPTS += -ignore-package $(PACKAGE) -else -ifneq "$(strip $(GHC))" "" -# Making the assumption here that standalone packages will be using mk/config.mk:GHC -SRC_HC_OPTS = $(shell if (test $(GhcCanonVersion) -ge 603); then echo "-ignore-package $(PACKAGE)"; fi) -else -SRC_HC_OPTS += -ignore-package $(PACKAGE) -endif -endif +SRC_HC_OPTS += $(IGNORE_PACKAGE_FLAG) SRC_HC_OPTS += $(GhcLibHcOpts) SRC_HC_OPTS += $(patsubst %, -package %, $(PACKAGE_DEPS)) endif @@ -185,7 +143,9 @@ ifeq "$(NON_HS_PACKAGE)" "" SRC_HC_OPTS += -fgenerics endif +ifndef LIBRARY LIBRARY = libHS$(PACKAGE)$(_way).a +endif ifeq "$(WAYS)" "" WAYS = $(GhcLibWays) @@ -242,15 +202,10 @@ endif # ----------------------------------------------------------------------------- # Dependencies -ifeq "$(STANDALONE_PACKAGE)" "NO" MKDEPENDHS = $(GHC_INPLACE) -endif SRC_MKDEPENDC_OPTS += $(addprefix -I,$(ALL_DIRS)) - -ifeq "$(STANDALONE_PACKAGE)" "NO" SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR) -endif endif # $(PACKAGE) != "" @@ -277,7 +232,9 @@ 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) @@ -316,21 +273,35 @@ DYLD_LIBRARY = $(patsubst %.a,%_dyn.dylib,$(LIBRARY)) # About the options used for Darwin: # -dynamiclib # Apple's way of saying -shared - # -flat_namespace -undefined suppress: + # -undefined dynamic_lookup: # Without these options, we'd have to specify the correct dependencies - # for each of the dylibs. Twolevel namespaces are in general a good thing - # (they make things more robust), so we should fix this sooner or later. + # for each of the dylibs. Note that we could (and should) do without this + # for all libraries except the RTS; all we need to do is to pass the + # correct HSfoo_dyn.dylib files to the link command. + # This feature requires Mac OS X 10.3 or later; there is a similar feature, + # -flat_namespace -undefined suppress, which works on earlier versions, + # but it has other disadvantages. + # -single_module + # Build the dynamic library as a single "module", i.e. no dynamic binding + # nonsense when referring to symbols from within the library. The NCG + # assumes that this option is specified (on i386, at least). + # -Wl,-macosx_version_min -Wl,10.3 + # Tell the linker its safe to assume that the library will run on 10.3 or + # later, so that it will not complain about the use of the option + # -undefined dynamic_lookup above. # -install_name # Causes the dynamic linker to ignore the DYLD_LIBRARY_PATH when loading # this lib and instead look for it at its absolute path. # When installing the .dylibs (see target.mk), we'll change that path to - # point to the place they are installed. - # 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 + # point to the place they are installed. Therefore, we won't have to set + # up DYLD_LIBRARY_PATH specifically for ghc. $(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS) - $(CC) -dynamiclib -o $@ $(STUBOBJS) $(LIBOBJS) -flat_namespace -undefined suppress -install_name `pwd`/$@ + $(CC) -dynamiclib -o $@ $(STUBOBJS) $(LIBOBJS) \ + -undefined dynamic_lookup -single_module \ + -Wl,-macosx_version_min -Wl,10.3 \ + -install_name `pwd`/$@ + else DYLD_LIBRARY = $(patsubst %.a,%_dyn.so,$(LIBRARY)) @@ -356,9 +327,9 @@ endif # $(LIBRARY) /= "" 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)" "" @@ -377,33 +348,40 @@ 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