X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=72bb4376e793bc2bed29a86c427e56ad1c919693;hb=3f149d7293f5ce37c8211d8d51ea3665e077272f;hp=098e189a648773e77644565a2c3581075955246e;hpb=bc28236ad12eb65994b68c690a5069b7e0257c61;p=ghc-hetmet.git diff --git a/mk/package.mk b/mk/package.mk index 098e189..72bb437 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -1,16 +1,8 @@ # ----------------------------------------------------------------------------- -# $Id: package.mk,v 1.47 2005/02/09 10:11: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" -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,44 +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)" "" -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 +143,9 @@ ifeq "$(NON_HS_PACKAGE)" "" SRC_HC_OPTS += -fgenerics endif +ifndef LIBRARY LIBRARY = libHS$(PACKAGE)$(_way).a +endif ifeq "$(WAYS)" "" WAYS = $(GhcLibWays) @@ -228,25 +199,24 @@ else INSTALL_IFACES += $(HS_IFACES) endif -# install library (could be implicitly specified or explicitly, like libHS*_cbits.a) -INSTALL_LIBS += $(LIBRARY) - # ----------------------------------------------------------------------------- # 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) != "" #-------------------------------------------------------------- +# Installation + +ifneq "$(NO_INSTALL_LIBRARY)" "YES" +INSTALL_LIBS += $(LIBRARY) $(GHCI_LIBRARY) +endif + +#-------------------------------------------------------------- # Building dynamically-linkable libraries for GHCi # # Build $(GHCI_LIBRARY) whenever we build $(LIBRARY) @@ -262,9 +232,11 @@ ifneq "$(LIBRARY)" "" ifeq "$(way)" "" ifeq "$(GhcWithInterpreter)" "YES" +ifndef GHCI_LIBRARY GHCI_LIBRARY = $(patsubst lib%.a,%.o,$(LIBRARY)) +endif -ifneq "$(PACKAGE)" "" +ifneq "$(NO_INSTALL_LIBRARY)" "YES" INSTALL_LIBS += $(GHCI_LIBRARY) endif @@ -305,6 +277,9 @@ DYLD_LIBRARY = $(patsubst %.a,%_dyn.dylib,$(LIBRARY)) # 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. + # -undefined dynamic_lookup: + # Another way to avoid having to specify the correct dependencies, but + # this time, we don't allow overriding symbols. # -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. @@ -315,7 +290,7 @@ DYLD_LIBRARY = $(patsubst %.a,%_dyn.dylib,$(LIBRARY)) # library dir. -- Wolfgang $(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS) - $(CC) -dynamiclib -o $@ $(STUBOBJS) $(LIBOBJS) -flat_namespace -undefined suppress -install_name `pwd`/$@ + $(CC) -dynamiclib -o $@ $(STUBOBJS) $(LIBOBJS) -undefined dynamic_lookup -install_name `pwd`/$@ else DYLD_LIBRARY = $(patsubst %.a,%_dyn.so,$(LIBRARY)) @@ -323,7 +298,7 @@ $(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS) $(CC) -shared -o $@ $(STUBOBJS) $(LIBOBJS) endif -ifneq "$(PACKAGE)" "" +ifneq "$(NO_INSTALL_LIBRARY)" "YES" INSTALL_LIBS += $(DYLD_LIBRARY) endif @@ -341,9 +316,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)" "" @@ -362,33 +337,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