X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=240bcc82bcb00c90119e04b4acade5de2cae53f2;hp=0ef78d89cf9a95c34b248f13cab7f62c66371868;hb=7022469ab84b59f18ce4ad0dbae2b81b5274a2b9;hpb=b802bbad8dc2a401c131264cbd08620179f8999b diff --git a/libraries/Makefile b/libraries/Makefile index 0ef78d8..240bcc8 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -20,9 +20,12 @@ # [ -e foo/configure.ac ] && ( cd foo && autoreconf ) # make make.library.foo -.PHONY: default_target +.PHONY: default_target show -default_target: build +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) @@ -35,15 +38,15 @@ default_target: build TOP=.. include $(TOP)/mk/boilerplate.mk -SUBDIRS = base old-locale old-time directory process filepath pretty \ - 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,22 @@ space=$(empty) $(empty) # ----------------------------------------------------------------------------- +docdir := $(docdir)/libraries/$$pkgid +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. +htmldir_configure = $$topdir/doc/libraries/$$pkgid +htmldir_install = $(prefix)/doc/libraries/$$pkgid +else +# On non-Windows we can just give absolute paths all the time, and +# thus obey the htmldir that we are given. +htmldir_configure = $(htmldir)/libraries/$$pkgid +htmldir_install = $(htmldir_configure) +endif + ifneq "$(DOING_BIN_DIST)" "YES" CONFIGURE_OPTS = @@ -98,6 +117,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 @@ -117,7 +141,6 @@ subdirs: boot: $(BOOTSTRAP_STAMPS) ifBuildable/ifBuildable \ $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) \ - $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile) \ installPackage/installPackage # We build the Setup program in a setup subdirectory to stop it trying @@ -168,6 +191,8 @@ endif $(foreach SUBDIR,$(SUBDIRS),rebuild.library.$(SUBDIR)):\ rebuild.library.%: clean.library.% make.library.% +# NB. we're depending on make chasing dependencies from left to right here. +# This bit goes wrong with 'make -j'. build: $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)) build: installPackage/installPackage @@ -180,19 +205,15 @@ 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 explicitly set datadir to a sensible value, as Cabal (used to?) use +# "C:\\Program Files\\Common Files" +# on Windows -# 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" -libsubdir = $$pkgid -else -libsubdir = $$compiler/lib/$$pkgid -endif +# We rely on all the CONFIGURE_ARGS being quoted with '...', and there +# being no 's inside the values. +FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\ + $(space)--configure-option=',\ + $(space)$(CONFIGURE_ARGS)) $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \ @@ -201,16 +222,20 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup ( cd $* && setup/Setup configure \ $(CONFIGURE_OPTS) \ --prefix='$$topdir' \ - --datadir='$$prefix/share' \ - --libsubdir='$(libsubdir)' \ - --with-compiler=../../compiler/ghc-inplace$(dot_bat) \ - --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$(dot_bat) \ - --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace$(dot_bat) \ + --bindir='$(bindir)' \ + --libdir='$(libdir)' \ + --libsubdir='$$pkgid' \ + --libexecdir='$(libexecdir)' \ + --datadir='$(datadir)' \ + --docdir='$(docdir)' \ + --htmldir='$(htmldir_configure)' \ + --with-compiler=../../compiler/stage1/ghc-inplace \ + --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \ + --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \ --with-ld=$(LD) \ - --datasubdir=ghc \ - --haddock-args="--use-contents=../index.html \ + --haddock-options="--use-contents=../index.html \ --use-index=../doc-index.html" \ - $(addprefix --configure-option=,$(CONFIGURE_ARGS)) \ + $(FLAGGED_CONFIGURE_ARGS) \ --configure-option=--with-cc=$(CC) ) \ && touch $@ || touch $*/unbuildable # We don't touch $@ if configure failed as we would prefer to try @@ -223,34 +248,41 @@ $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/GNUmakefile \ %/setup/Setup ifBuildable/ifBuildable - ifBuildable/ifBuildable $* $(MAKE) - ifBuildable/ifBuildable $* setup/Setup register --inplace + if ifBuildable/ifBuildable $*; then \ + cd $* && \ + $(MAKE) $(MFLAGS) && \ + setup/Setup register --inplace; \ + fi # Build the library using 'setup build' (not the default) $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup ifBuildable/ifBuildable - ifBuildable/ifBuildable $* setup/Setup build \ - $(addprefix --ghc-option=,$(GhcLibHcOpts)) + if ifBuildable/ifBuildable $*; then \ + cd $* && \ + setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \ + fi $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\ %/GNUmakefile: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup ifBuildable/ifBuildable $(RM) $*/GNUmakefile cp Makefile.local $* - ifBuildable/ifBuildable $* setup/Setup makefile -f GNUmakefile + if ifBuildable/ifBuildable $*; then \ + cd $* && setup/Setup makefile -f GNUmakefile; \ + fi .PHONY: doc -DOC_SUBDIRS = $(filter-out haskell98,$(SUBDIRS)) - doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)) sh gen_contents_index $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup ifBuildable/ifBuildable - ifBuildable/ifBuildable $* setup/Setup haddock + if ifBuildable/ifBuildable $*; then \ + cd $* && setup/Setup haddock --html-location='../$$pkg'; \ + fi .PHONY: distclean clean clean.library.% @@ -260,30 +292,30 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) $(RM) -f stamp/bootstrapping.* $(RM) -rf bootstrapping.* $(RM) -rf ifBuildable - $(RM) -f libraries.txt index.html doc-index.html + $(RM) -rf installPackage + $(RM) -f libraries.txt index.html doc-index.html doc-index*.html $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \ clean.library.%: $(RM) -f stamp/configure.library.*.$* $*/unbuildable -cd $* && setup/Setup clean $(RM) -rf $*/setup + $(RM) $*/GNUmakefile $*/Makefile.local endif # ----------------------------------------------------------------------------- .PHONY: install install-docs install.library.% -ROOT=$(prefix)/share/ghc/doc/html/ - install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)) ifeq "$(HADDOCK_DOCS)" "YES" - $(INSTALL_DIR) $(ROOT) - $(INSTALL_DATA) index.html doc-index.html $(ROOT) - $(INSTALL_SCRIPT) gen_contents_index $(ROOT) + $(INSTALL_DIR) $(DESTDIR)$(htmldir_install) + $(INSTALL_DATA) index.html doc-index*.html $(DESTDIR)$(htmldir_install) + $(INSTALL_SCRIPT) gen_contents_index $(DESTDIR)$(htmldir_install) # Hacks: - $(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.css $(ROOT) - $(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.js $(ROOT) - $(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.gif $(ROOT) + $(INSTALL_DATA) $(DESTDIR)$(htmldir_install)/base-*/*.css $(DESTDIR)$(htmldir_install) + $(INSTALL_DATA) $(DESTDIR)$(htmldir_install)/base-*/*.js $(DESTDIR)$(htmldir_install) + $(INSTALL_DATA) $(DESTDIR)$(htmldir_install)/base-*/*.gif $(DESTDIR)$(htmldir_install) endif # Cabal doesn't let us ask to install docs only, so do nothing here @@ -293,9 +325,19 @@ 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 - ifBuildable/ifBuildable $* ../installPackage/installPackage $(prefix) $(bindir)/ghc-pkg + if ifBuildable/ifBuildable $*; then \ + cd $* && \ + ../installPackage/installPackage '$(DESTDIR)' '$(prefix)' '$(bindir)' '$(libdir)' '$(libexecdir)' '$(datadir)' '$(docdir)' '$(htmldir_install)' '$(htmldir_configure)' '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' ; \ + fi .PHONY: binary-dist binary-dist.library.% @@ -307,21 +349,25 @@ 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)/$* - ifBuildable/ifBuildable $* cp $*.cabal $(BIN_DIST_LIBDIR)/$* - ifBuildable/ifBuildable $* cp -a dist $(BIN_DIST_LIBDIR)/$* - # Euch - ifBuildable/ifBuildable $* cp -aL include $(BIN_DIST_LIBDIR)/$* || : - ifBuildable/ifBuildable $* $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \ - \( -name "*_split" -o -name "autogen" \) | xargs rm -rf - ifBuildable/ifBuildable $* $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \ + if ifBuildable/ifBuildable $*; then \ + $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*; \ + cd $* && \ + cp $*.cabal $(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 \ \( \( -name "*.o" -o -name "*.p_o" \) -a ! -name "HS*" \) \ - -exec rm {} \; - + -exec rm {} \; ; \ + fi