# -----------------------------------------------------------------------------
-# $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.
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}
-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' >$@
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
# 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)
endif
$(STAMP_PKG_CONF) : package.conf.inplace package.conf.installed
- $(GHC_PKG_INPLACE) --force --update-package <package.conf.inplace
- $(GHC_PKG_INPLACE) -f $(GHC_DRIVER_DIR)/package.conf --force --update-package <package.conf.installed
+ $(GHC_PKG_INPLACE) update - --force-files <package.conf.inplace
+ $(GHC_PKG_INPLACE) update - -f $(GHC_DRIVER_DIR)/package.conf --force-files <package.conf.installed
@touch $(STAMP_PKG_CONF)
CLEAN_FILES += package.conf.installed package.conf.inplace
-else # $(STANDALONE_PACKAGE) == "YES"
-
-PACKAGE_CPP_OPTS += -DPACKAGE_DEPS='$(subst " ","$(comma) ",$(patsubst %,"%",$(PACKAGE_DEPS)))'
-PACKAGE_CPP_OPTS += -DLIBRARY=\"HS$(PACKAGE)\"
-PACKAGE_CPP_OPTS += -DLIBDIR=\"$(libdir)\"
-
-# Let the package configuration file refer to $(libdir) as
-# ${pkglibdir}. Note we can't use ${libdir} because ghc-pkg already
-# redefines it to point to GHC's libdir (bug or feature?).
-#
-install :: package.conf.installed
- $(GHC_PKG) --force --update-package <package.conf.installed
-
-# Invoke this rule by hand in order to use the package in-place
-install-inplace-pkg : package.conf.inplace
- $(GHC_PKG) --force --update-package <package.conf.inplace
-
-endif # $(STANDALONE_PACKAGE)
-
endif # $(way) == ""
# -----------------------------------------------------------------------------
# Building the static library libHS<pkg>.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
SRC_HC_OPTS += -fgenerics
endif
+ifndef LIBRARY
LIBRARY = libHS$(PACKAGE)$(_way).a
+endif
ifeq "$(WAYS)" ""
WAYS = $(GhcLibWays)
# -----------------------------------------------------------------------------
# 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) != ""
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)
# 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))
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)" ""
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
projects / ghc-hetmet.git / blobdiff