X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=ea574e11064720ca356b06dafc9602de80ce4237;hb=2a4d586c8abefa2b0d2a782c421697fd6cf0c964;hp=04404d281c2a04416b60cf3302cae07bb85920e7;hpb=1abb3c63204c465f90326b945a9b173021198911;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index 04404d2..ea574e1 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -8,7 +8,7 @@ # To rebuild a particular library : # # make clean.library. -# make build.library. +# make make.library. # # or the following is equivalent: # @@ -18,26 +18,35 @@ # # darcs get http://darcs.haskell.org/packages/foo # [ -e foo/configure.ac ] && ( cd foo && autoreconf ) -# make build.library.foo +# 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) +# when we want to rebuild another library later. +# So for now we just don't do anything in parallel in here. +.NOTPARALLEL: # Ideally we'd just include something to give us variables # for paths and arguments to tools etc, and those set in mk/build.mk. 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. @@ -53,13 +62,7 @@ SUBDIRS += $(wildcard QuickCheck) SUBDIRS += $(wildcard HUnit) SUBDIRS += $(wildcard mtl) SUBDIRS += $(wildcard fgl) -SUBDIRS += $(wildcard X11) SUBDIRS += $(wildcard time) -ifeq "$(Windows)" "NO" -# HGL is not working on Win32, so omit it for now. Better not to ship it -# at all than to ship a broken version. -SUBDIRS += $(wildcard HGL) -endif SUBDIRS += $(wildcard OpenGL) SUBDIRS += $(wildcard GLUT) SUBDIRS += $(wildcard OpenAL) @@ -67,11 +70,11 @@ SUBDIRS += $(wildcard ALUT) SUBDIRS += $(wildcard stm) SUBDIRS += $(wildcard xhtml) SUBDIRS += $(wildcard cgi) -SUBDIRS += $(wildcard arrows) ifeq "$(GhcLibsWithObjectIO)" "YES" SUBDIRS += $(wildcard ObjectIO) endif SUBDIRS += $(wildcard parallel) +SUBDIRS += $(wildcard ndp) endif # ----------------------------------------------------------------------------- @@ -81,6 +84,35 @@ 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/$$pkgid +iinterfacedir = $$topdir/doc/libraries/$$pkgid +ihtmldir = $$httptopdir/doc/libraries/$$pkgid +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/$$pkgid +iinterfacedir = $(htmldir)/libraries/$$pkgid +ihtmldir = $(htmldir)/libraries/$$pkgid +html_installed_root = $(htmldir)/libraries +endif + ifneq "$(DOING_BIN_DIST)" "YES" CONFIGURE_OPTS = @@ -91,6 +123,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 @@ -98,8 +135,8 @@ endif BOOTSTRAP_LIBS = Cabal filepath BOOTSTRAP_STAMPS = $(addprefix stamp/bootstrapping.,$(BOOTSTRAP_LIBS)) -BOOTSTRAP_INC_1_UP = $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS)) -BOOTSTRAP_INC_2_UP = $(addprefix -i../../bootstrapping.,$(BOOTSTRAP_LIBS)) +BOOTSTRAP_INC_1_UP = -DCABAL_VERSION=1,3 $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS)) +BOOTSTRAP_INC_2_UP = -DCABAL_VERSION=1,3 $(addprefix -i../../bootstrapping.,$(BOOTSTRAP_LIBS)) .PHONY: subdirs @@ -151,39 +188,37 @@ $(BOOTSTRAP_STAMPS): stamp/bootstrapping.%: all: build -ifneq "$(NO_HADDOCK_DOCS)" "YES" +ifeq "$(HADDOCK_DOCS)" "YES" all: doc endif .PHONY: rebuild.library.% $(foreach SUBDIR,$(SUBDIRS),rebuild.library.$(SUBDIR)):\ -rebuild.library.%: clean.library.% build.library.% +rebuild.library.%: clean.library.% make.library.% -build: $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)) +# 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 configure: $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)) .PHONY: build.library.% +.PHONY: make.library.% # 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 put non-existant paths in when configuring, as we require that +# builds don't depend on these paths when making bindists. -# 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)): \ @@ -191,49 +226,71 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup -$(RM) -f stamp/configure.library.*.$* $*/unbuildable ( 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) \ + --prefix=/NONEXISTANT \ + --bindir=/NONEXISTANT \ + --libdir=/NONEXISTANT \ + --libsubdir='$$pkgid' \ + --libexecdir=/NONEXISTANT \ + --datadir=/NONEXISTANT \ + --docdir=/NONEXISTANT \ + --interfacedir=/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) \ - --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 # 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' +$(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\ +make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ + %/GNUmakefile \ + %/setup/Setup ifBuildable/ifBuildable + 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)) - ifBuildable/ifBuildable $* setup/Setup register --inplace + if ifBuildable/ifBuildable $*; then \ + cd $* && \ + setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \ + fi -$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/CabalMakefile):\ -%/CabalMakefile: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ +$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\ +%/GNUmakefile: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup ifBuildable/ifBuildable - $(RM) $*/CabalMakefile - ifBuildable/ifBuildable $* setup/Setup makefile -f CabalMakefile \ - $(addprefix --ghc-option=,$(GhcLibHcOpts)) + $(RM) $*/GNUmakefile + cp Makefile.local $* + if ifBuildable/ifBuildable $*; then \ + cd $* && setup/Setup makefile -f GNUmakefile; \ + fi -.PHONY: doc +.PHONY: doc html -DOC_SUBDIRS = $(filter-out haskell98,$(SUBDIRS)) +html: doc doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)) - sh gen_contents_index + sh gen_contents_index --inplace $(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='../$$pkgid'; \ + fi .PHONY: distclean clean clean.library.% @@ -243,30 +300,34 @@ 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 + $(RM) -f haddock* *.gif + +distclean: + $(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak) $(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)) -ifneq "$(NO_HADDOCK_DOCS)" "YES" - $(INSTALL_DIR) $(ROOT) - $(INSTALL_DATA) index.html doc-index.html $(ROOT) - $(INSTALL_SCRIPT) gen_contents_index $(ROOT) +ifeq "$(HADDOCK_DOCS)" "YES" + $(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) $(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) base/dist/doc/html/*/*.css $(DESTDIR)$(html_installed_root) + $(INSTALL_DATA) base/dist/doc/html/*/*.js $(DESTDIR)$(html_installed_root) + $(INSTALL_DATA) base/dist/doc/html/*/*.gif $(DESTDIR)$(html_installed_root) endif # Cabal doesn't let us ask to install docs only, so do nothing here @@ -276,9 +337,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 '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(iinterfacedir)' ; \ + fi .PHONY: binary-dist binary-dist.library.% @@ -290,22 +361,37 @@ 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) + # This gets used in the compiler directory to see if GHC should + # depend on the readline package or not + $(MKDIRHIER) $(BIN_DIST_LIBDIR)/readline + cp readline/config.mk $(BIN_DIST_LIBDIR)/readline $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \ binary-dist.library.%: - $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$* - ifBuildable/ifBuildable $* cp $*.cabal $(BIN_DIST_LIBDIR)/$* - ifBuildable/ifBuildable $* cp .setup-config $(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)/$* && \ + $(FIND) . -name "*.buildinfo" -exec cp {} $(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 + +# Ignore some doc targets that we don't support +# The root recurses into us when these targets are made +.PHONY: html-no-chunks chm HxS fo dvi ps pdf +html-no-chunks chm HxS fo dvi ps pdf: + @: