X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=6a38e3d58bbc96a1a7490844a523a76f01c28f0a;hp=2bd80fa4787ff6ddb8fbff2ebbd18420e7c4d1bc;hb=a385f0af5ea320a18d580f6a36c59c55b3516efd;hpb=2069911cfbc3d31dfdb34845b3fe17ab7b770aa6 diff --git a/libraries/Makefile b/libraries/Makefile index 2bd80fa..6a38e3d 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -12,7 +12,7 @@ # # or the following is equivalent: # -# make rebuild.library. +# make remake.library. # # To add a new library to the tree, do # @@ -38,15 +38,15 @@ show: TOP=.. include $(TOP)/mk/boilerplate.mk -SUBDIRS = base array packedstring containers bytestring -SUBDIRS += old-locale old-time filepath directory +SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base array packedstring +SUBDIRS += containers bytestring 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 +SUBDIRS += process pretty hpc template-haskell editline Cabal random haskell98 # Set GhcBootLibs=YES from the command line to work with just the libraries # needed to bootstrap GHC. @@ -62,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) @@ -76,7 +70,6 @@ SUBDIRS += $(wildcard ALUT) SUBDIRS += $(wildcard stm) SUBDIRS += $(wildcard xhtml) SUBDIRS += $(wildcard cgi) -SUBDIRS += $(wildcard arrows) ifeq "$(GhcLibsWithObjectIO)" "YES" SUBDIRS += $(wildcard ObjectIO) endif @@ -91,20 +84,35 @@ 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 +iprefix = $$topdir +ibindir = $$topdir +ilibdir = $$topdir +ilibexecdir = $$topdir +idynlibdir = $$topdir +idatadir = $$topdir +idocdir = $$topdir/doc/libraries/$$pkg +ihaddockdir = $$topdir/doc/libraries/$$pkg +ihtmldir = $$httptopdir/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. -htmldir_configure = $(htmldir)/libraries/$$pkgid -htmldir_install = $(htmldir_configure) +iprefix = $(prefix) +ibindir = $(bindir) +ilibdir = $(libdir) +ilibexecdir = $(libexecdir) +idynlibdir = $(dynlibdir) +idatadir = $(datadir) +idocdir = $(docdir)/libraries/$$pkg +ihaddockdir = $(htmldir)/libraries/$$pkg +ihtmldir = $(htmldir)/libraries/$$pkg +html_installed_root = $(htmldir)/libraries endif ifneq "$(DOING_BIN_DIST)" "YES" @@ -127,10 +135,16 @@ CONFIGURE_OPTS += --enable-split-objs CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting endif +ifneq "$(HSCOLOUR)" "" +CONFIGURE_OPTS += --with-hscolour=$(HSCOLOUR) +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)) +DEPLOYMENT_OPTS = $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) \ + $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS)) .PHONY: subdirs @@ -149,27 +163,44 @@ boot: $(BOOTSTRAP_STAMPS) ifBuildable/ifBuildable \ # We ought to be depending on %/Setup.*hs, but make makes that difficult. +# -fffi is only needed for GHC 6.4 at the time of writing +CABAL_GHC_FLAGS = -Wall -cpp -fffi + $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \ %/setup/Setup: $(BOOTSTRAP_STAMPS) -$(RM) -rf $*/setup mkdir $*/setup $(CP) $*/Setup.*hs $*/setup - cd $*/setup && $(GHC) -Wall -cpp --make Setup.*hs -o Setup \ + cd $*/setup && $(GHC) $(CABAL_GHC_FLAGS) --make Setup.*hs -o Setup \ $(BOOTSTRAP_INC_2_UP) installPackage/installPackage: installPackage.hs $(BOOTSTRAP_STAMPS) -$(RM) -rf installPackage mkdir installPackage $(CP) installPackage.hs installPackage/ - cd installPackage && $(GHC) -Wall -cpp \ +ifeq "$(stage)" "2" + cd installPackage && ../$(HC) $(CABAL_GHC_FLAGS) \ + --make installPackage -o installPackage \ + $(BOOTSTRAP_INC_1_UP) $(DEPLOYMENT_OPTS) +else + cd installPackage && $(GHC) $(CABAL_GHC_FLAGS) \ --make installPackage -o installPackage \ $(BOOTSTRAP_INC_1_UP) +endif +# TODO: The conditional is yucky, but we need to be able to build with stage1 +# for bindists and as installPackages/ has no Makefile, it seems hard +# to make this nicer. ifBuildable/ifBuildable: ifBuildable.hs -$(RM) -rf ifBuildable mkdir ifBuildable $(CP) ifBuildable.hs ifBuildable/ +ifeq "$(stage)" "2" + cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable \ + $(DEPLOYMENT_OPTS) +else cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable +endif $(BOOTSTRAP_STAMPS): stamp/bootstrapping.%: $(RM) -rf bootstrapping.$* @@ -187,9 +218,13 @@ all: doc endif .PHONY: rebuild.library.% +.PHONY: remake.library.% $(foreach SUBDIR,$(SUBDIRS),rebuild.library.$(SUBDIR)):\ -rebuild.library.%: clean.library.% make.library.% +rebuild.library.%: clean.library.% build.library.% + +$(foreach SUBDIR,$(SUBDIRS),remake.library.$(SUBDIR)):\ +remake.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'. @@ -205,9 +240,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 a sensible value, as Cabal (used to?) use -# "C:\\Program Files\\Common Files" -# on Windows +# 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. @@ -215,20 +249,23 @@ FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\ $(space)--configure-option=',\ $(space)$(CONFIGURE_ARGS)) -$(foreach SUBDIR,$(SUBDIRS), \ - stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \ -stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup - -$(RM) -f stamp/configure.library.*.$* $*/unbuildable - ( cd $* && setup/Setup configure \ +ifeq "$(Windows)" "YES" +NONEXISTENT=c:/NONEXISTENT +else +NONEXISTENT=/NONEXISTENT +endif + +ALL_CONFIGURE_FLAGS = \ $(CONFIGURE_OPTS) \ - --prefix='$$topdir' \ - --bindir='$(bindir)' \ - --libdir='$(libdir)/lib' \ + --prefix=$(NONEXISTENT) \ + --bindir=$(NONEXISTENT) \ + --libdir=$(NONEXISTENT) \ --libsubdir='$$pkgid' \ - --libexecdir='$(libexecdir)' \ - --datadir='$(datadir)' \ - --docdir='$(docdir)' \ - --htmldir='$(htmldir_configure)' \ + --libexecdir=$(NONEXISTENT) \ + --datadir=$(NONEXISTENT) \ + --docdir=$(NONEXISTENT) \ + --haddockdir=$(NONEXISTENT) \ + --htmldir=$(NONEXISTENT) \ --with-compiler=../../compiler/stage1/ghc-inplace \ --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \ --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \ @@ -236,7 +273,13 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup --haddock-options="--use-contents=../index.html \ --use-index=../doc-index.html" \ $(FLAGGED_CONFIGURE_ARGS) \ - --configure-option=--with-cc=$(CC) ) \ + --configure-option=--with-cc=$(CC) + +$(foreach SUBDIR,$(SUBDIRS), \ + stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \ +stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup + -$(RM) -f stamp/configure.library.*.$* $*/unbuildable + ( cd $* && setup/Setup configure $(ALL_CONFIGURE_FLAGS) ) \ && 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. @@ -244,16 +287,28 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup # build dies! # Build the library using 'make' -$(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\ +# We re-run 'setup makefile' each time, just in case any preprocessing +# needs to be done. However, we're careful not to overwrite GNUmakefile +# if it hasn't changed, so that dependency-generation isn't forced +# every time. +# I doubt that the makefile way will work with ndp, so filter it out and use +# a rule below to call build.library.ndp instead +$(foreach SUBDIR,$(filter-out ndp,$(SUBDIRS)),make.library.$(SUBDIR)):\ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - %/GNUmakefile \ - %/setup/Setup ifBuildable/ifBuildable + %/setup/Setup ifBuildable/ifBuildable installPackage/installPackage if ifBuildable/ifBuildable $*; then \ cd $* && \ + cmp -s ../Makefile.local Makefile.local || cp ../Makefile.local .; \ + mv GNUmakefile GNUmakefile.tmp; \ + setup/Setup makefile -f GNUmakefile; \ + cmp -s GNUmakefile GNUmakefile.tmp && mv GNUmakefile.tmp GNUmakefile; \ $(MAKE) $(MFLAGS) && \ setup/Setup register --inplace; \ fi +# Hack for ndp, as described above +make.library.ndp: build.library.ndp + # Build the library using 'setup build' (not the default) $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ @@ -261,28 +316,33 @@ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ if ifBuildable/ifBuildable $*; then \ cd $* && \ setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \ + setup/Setup register --inplace; \ fi -$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\ -%/GNUmakefile: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - %/setup/Setup ifBuildable/ifBuildable - $(RM) $*/GNUmakefile - cp Makefile.local $* - if ifBuildable/ifBuildable $*; then \ - cd $* && setup/Setup makefile -f GNUmakefile; \ - fi +.PHONY: doc html -.PHONY: doc +html: doc doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)) - sh gen_contents_index + sh gen_contents_index --inplace + +# Making hyperlinked source only works if we have hscolour +ifneq "$(HSCOLOUR)" "" +CABAL_HADDOCK_FLAGS=--hyperlink-source +endif $(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 --html-location='../$$pkg'; \ + cd $* && setup/Setup haddock --html-location='../$$pkg' \ + $(CABAL_HADDOCK_FLAGS); \ fi +ifneq "$(HSCOLOUR)" "" +# We use */src rather than $*/src due to the $(INTEGER_LIBRARY)/integer +# mismatch + if ifBuildable/ifBuildable $*; then cp hscolour.css $*/dist/doc/html/*/src/; fi +endif .PHONY: distclean clean clean.library.% @@ -294,6 +354,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) $(RM) -rf ifBuildable $(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) @@ -312,13 +373,13 @@ endif install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)) ifeq "$(HADDOCK_DOCS)" "YES" - $(INSTALL_DIR) $(DESTDIR)$(htmldir_install) - $(INSTALL_DATA) index.html doc-index*.html $(DESTDIR)$(htmldir_install) - $(INSTALL_SCRIPT) gen_contents_index $(DESTDIR)$(htmldir_install) + $(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) $(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) + $(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 @@ -339,7 +400,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: installPackage/installPackage ifBuildable/ifBuildable if ifBuildable/ifBuildable $*; then \ cd $* && \ - ../installPackage/installPackage '$(DESTDIR)' '$(prefix)' '$(bindir)' '$(libdir)/lib' '$(libexecdir)' '$(datadir)' '$(docdir)' '$(htmldir_install)' '$(htmldir_configure)' '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' ; \ + ../installPackage/installPackage install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \ fi .PHONY: binary-dist binary-dist.library.% @@ -367,6 +428,8 @@ binary-dist.library.%: cp $*.cabal $(BIN_DIST_LIBDIR)/$* && \ cp LICENSE $(BIN_DIST_LIBDIR)/$* && \ cp -R dist $(BIN_DIST_LIBDIR)/$* && \ + $(FIND) . -name "*.buildinfo" -exec cp {} $(BIN_DIST_LIBDIR)/$* \; && \ + $(FIND) . -name unbuildable -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 && \ @@ -374,3 +437,10 @@ binary-dist.library.%: \( \( -name "*.o" -o -name "*.p_o" \) -a ! -name "HS*" \) \ -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: + @: +