X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=d9cc69a13e1a8f51fec49bf2b92229741c4d5a37;hp=0c845c9cf4b1db8aea84b3f2c75e551ed6eecc2c;hb=02924d52507ab58a05b3cb412a505e4cec86c413;hpb=8fce302bbaf3d0696ffa5ce98013e47ba6ba6c6c diff --git a/libraries/Makefile b/libraries/Makefile index 0c845c9..d9cc69a 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -20,10 +20,13 @@ # [ -e foo/configure.ac ] && ( cd foo && autoreconf ) # make make.library.foo -.PHONY: default_target +.PHONY: default_target show default_target: all +show: + @echo '$(VALUE)="$($(VALUE))"' + # make doesn't give us an easy way to get the libraries built in # dependency order the first time, but not rebuild base (for example) # when we want to rebuild another library later. @@ -35,15 +38,15 @@ default_target: all TOP=.. include $(TOP)/mk/boilerplate.mk -SUBDIRS = base old-locale old-time filepath directory process pretty \ - hpc template-haskell readline Cabal random haskell98 - +SUBDIRS = base array packedstring containers bytestring +SUBDIRS += old-locale old-time filepath directory ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix endif ifeq "$(Windows)" "YES" SUBDIRS += $(wildcard Win32) endif +SUBDIRS += process pretty hpc template-haskell readline Cabal random haskell98 # Set GhcBootLibs=YES from the command line to work with just the libraries # needed to bootstrap GHC. @@ -88,6 +91,33 @@ space=$(empty) $(empty) # ----------------------------------------------------------------------------- +ifeq "$(RelocatableBuild)" "YES" +# On Windows we want to make moveable bindists, but we need to tell +# ghc-pkg where the haddock docs are. Therefore we completely ignore +# where the user tells us to put the haddock documentation and put it +# somewhere whose relative location we know. When installing we need +# to give Cabal a real path, though. +iprefix = $$topdir +ibindir = $$topdir +ilibdir = $$topdir +ilibexecdir = $$topdir +idatadir = $$topdir +idocdir = $$topdir/doc/libraries/$$pkg +ihtmldir = $$topdir/doc/libraries/$$pkg +html_installed_root = $(prefix)/doc/libraries +else +# On non-Windows we can just give absolute paths all the time, and +# thus obey the htmldir that we are given. +iprefix = $(prefix) +ibindir = $(bindir) +ilibdir = $(libdir) +ilibexecdir = $(libexecdir) +idatadir = $(datadir) +idocdir = $(docdir)/libraries/$$pkg +ihtmldir = $(htmldir)/libraries/$$pkg +html_installed_root = $(ihtmldir) +endif + ifneq "$(DOING_BIN_DIST)" "YES" CONFIGURE_OPTS = @@ -98,6 +128,11 @@ CONFIGURE_OPTS += --enable-library-profiling CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-profiling endif +ifneq "$(findstring $(space)dyn$(space), $(space)$(GhcLibWays)$(space))" "" +CONFIGURE_OPTS += --enable-shared +CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-shared +endif + ifeq "$(SplitObjs)" "YES" CONFIGURE_OPTS += --enable-split-objs CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting @@ -181,24 +216,8 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ # We should depend on %/%.cabal here (and in other rules), but make # makes that difficult. -# We explicitly set datadir to "$prefix/share" as, while that is the -# default on Linux, on Windows it defaults to -# "C:\\Program Files\\Common Files" - -# We also set libsubdir differently on Windows and non-Windows, as on -# non-Windows the path we deduce is highre up than the path passed to -# the executable with the shell script on non-Windows. This should -# probably be tidied up so that we can always pass the same libsubdir. -ifeq "$(Windows)" "YES" -DATA_REL_DIR = . -datadir = $$prefix -libsubdir = $$pkgid -else -DATA_REL_DIR = share/ghc -datadir = $$prefix/share/ghc -libsubdir = $$compiler/lib/$$pkgid -endif -DOC_ROOT = $(prefix)/$(DATA_REL_DIR)/doc/html/ +# We put non-existant paths in when configuring, as we require that +# builds don't depend on these paths when making bindists. # We rely on all the CONFIGURE_ARGS being quoted with '...', and there # being no 's inside the values. @@ -212,22 +231,26 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup -$(RM) -f stamp/configure.library.*.$* $*/unbuildable ( cd $* && setup/Setup configure \ $(CONFIGURE_OPTS) \ - --prefix='$$topdir' \ - --datadir='$(datadir)' \ - --datasubdir='.' \ - --libsubdir='$(libsubdir)' \ - --with-compiler=../../compiler/stage1/ghc-inplace$ \ - --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$ \ + --prefix=/NONEXISTANT \ + --bindir=/NONEXISTANT \ + --libdir=/NONEXISTANT \ + --libsubdir='$$pkgid' \ + --libexecdir=/NONEXISTANT \ + --datadir=/NONEXISTANT \ + --docdir=/NONEXISTANT \ + --htmldir=/NONEXISTANT \ + --with-compiler=../../compiler/stage1/ghc-inplace \ + --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \ --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \ --with-ld=$(LD) \ - --haddock-args="--use-contents=../index.html \ + --haddock-options="--use-contents=../index.html \ --use-index=../doc-index.html" \ $(FLAGGED_CONFIGURE_ARGS) \ --configure-option=--with-cc=$(CC) ) \ && touch $@ || touch $*/unbuildable # We don't touch $@ if configure failed as we would prefer to try # configuring it next time round, rather than assuming it'll still fail. -# This is particularly important for corelibs, where failure means the +# This is particularly important for bootlibs, where failure means the # build dies! # Build the library using 'make' @@ -261,8 +284,6 @@ $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\ .PHONY: doc -DOC_SUBDIRS = $(filter-out haskell98,$(SUBDIRS)) - doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)) sh gen_contents_index @@ -270,7 +291,7 @@ $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup ifBuildable/ifBuildable if ifBuildable/ifBuildable $*; then \ - cd $* && setup/Setup haddock; \ + cd $* && setup/Setup haddock --html-location='../$$pkg'; \ fi .PHONY: distclean clean clean.library.% @@ -282,7 +303,10 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) $(RM) -rf bootstrapping.* $(RM) -rf ifBuildable $(RM) -rf installPackage - $(RM) -f libraries.txt index.html doc-index.html + $(RM) -f libraries.txt index.html doc-index.html doc-index*.html + +distclean: + $(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak) $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \ clean.library.%: @@ -298,13 +322,13 @@ endif install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)) ifeq "$(HADDOCK_DOCS)" "YES" - $(INSTALL_DIR) $(DOC_ROOT) - $(INSTALL_DATA) index.html doc-index.html $(DOC_ROOT) - $(INSTALL_SCRIPT) gen_contents_index $(DOC_ROOT) + $(INSTALL_DIR) $(DESTDIR)$(html_installed_root) + $(INSTALL_DATA) index.html doc-index*.html $(DESTDIR)$(html_installed_root) + $(INSTALL_SCRIPT) gen_contents_index $(DESTDIR)$(html_installed_root) # Hacks: - $(INSTALL_DATA) $(DOC_ROOT)/base/*.css $(DOC_ROOT) - $(INSTALL_DATA) $(DOC_ROOT)/base/*.js $(DOC_ROOT) - $(INSTALL_DATA) $(DOC_ROOT)/base/*.gif $(DOC_ROOT) + $(INSTALL_DATA) $(DESTDIR)$(html_installed_root)/base*/*.css $(DESTDIR)$(html_installed_root) + $(INSTALL_DATA) $(DESTDIR)$(html_installed_root)/base*/*.js $(DESTDIR)$(html_installed_root) + $(INSTALL_DATA) $(DESTDIR)$(html_installed_root)/base*/*.gif $(DESTDIR)$(html_installed_root) endif # Cabal doesn't let us ask to install docs only, so do nothing here @@ -314,11 +338,18 @@ install-docs: # Ideally this would depend on a stamp/build.library.%, but if it does # then we can't change the libraries and then just rerun make. # Thus if you install without building then it will just break. + +# prefix and (on Windows) htmldir use $topdir when configuring, so we +# need to tell installPackage the real path to use when installing. + +# We also need to pass all the other directories in, as they can be +# overridden when installing a bindist. + $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: installPackage/installPackage ifBuildable/ifBuildable if ifBuildable/ifBuildable $*; then \ cd $* && \ - ../installPackage/installPackage $(prefix) $(bindir)/ghc-pkg; \ + ../installPackage/installPackage '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' ; \ fi .PHONY: binary-dist binary-dist.library.% @@ -331,20 +362,22 @@ binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) mkdir $(BIN_DIST_LIBDIR)/ifBuildable cp ifBuildable/ifBuildable $(BIN_DIST_LIBDIR)/ifBuildable cp Makefile $(BIN_DIST_LIBDIR) +ifeq "$(HADDOCK_DOCS)" "YES" cp gen_contents_index $(BIN_DIST_LIBDIR) cp index.html $(BIN_DIST_LIBDIR) - cp doc-index.html $(BIN_DIST_LIBDIR) - cp -a stamp $(BIN_DIST_LIBDIR) + cp doc-index*.html $(BIN_DIST_LIBDIR) +endif + cp -pR stamp $(BIN_DIST_LIBDIR) $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \ binary-dist.library.%: - $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$* if ifBuildable/ifBuildable $*; then \ + $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*; \ cd $* && \ cp $*.cabal $(BIN_DIST_LIBDIR)/$* && \ - cp -a dist $(BIN_DIST_LIBDIR)/$* && \ - # Euch \ - (cp -aL include $(BIN_DIST_LIBDIR)/$* || :) && \ + cp LICENSE $(BIN_DIST_LIBDIR)/$* && \ + cp -R dist $(BIN_DIST_LIBDIR)/$* && \ + (cp -RL include $(BIN_DIST_LIBDIR)/$* || true) && \ $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \ \( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \ $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \