X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=888beec40327efea950b8a26a5fc4096e4c2f14c;hp=9b61df22b8aa631d67e06262d4e0a6657e572b93;hb=1b5161f0e4a95725544880a282963a8859cd22ee;hpb=90cc2d2bbe13e3421977013cdfa49630c4817f88 diff --git a/libraries/Makefile b/libraries/Makefile index 9b61df2..888beec 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. @@ -74,9 +74,15 @@ ifeq "$(GhcLibsWithObjectIO)" "YES" SUBDIRS += $(wildcard ObjectIO) endif SUBDIRS += $(wildcard parallel) -SUBDIRS += $(wildcard ndp) +SUBDIRS_BUILD += $(wildcard ndp) +SUBDIRS_BUILD += $(wildcard dph/dph-base) +SUBDIRS_BUILD += $(wildcard dph/dph-prim-seq) +SUBDIRS_BUILD += $(wildcard dph/dph-prim-par) +SUBDIRS_BUILD += $(wildcard dph/dph) endif +SUBDIRS += $(SUBDIRS_BUILD) + # ----------------------------------------------------------------------------- empty= @@ -94,9 +100,10 @@ iprefix = $$topdir ibindir = $$topdir ilibdir = $$topdir ilibexecdir = $$topdir +idynlibdir = $$topdir idatadir = $$topdir idocdir = $$topdir/doc/libraries/$$pkg -iinterfacedir = $$topdir/doc/libraries/$$pkg +ihaddockdir = $$topdir/doc/libraries/$$pkg ihtmldir = $$httptopdir/doc/libraries/$$pkg html_installed_root = $(prefix)/doc/libraries else @@ -106,9 +113,10 @@ iprefix = $(prefix) ibindir = $(bindir) ilibdir = $(libdir) ilibexecdir = $(libexecdir) +idynlibdir = $(dynlibdir) idatadir = $(datadir) idocdir = $(docdir)/libraries/$$pkg -iinterfacedir = $(htmldir)/libraries/$$pkg +ihaddockdir = $(htmldir)/libraries/$$pkg ihtmldir = $(htmldir)/libraries/$$pkg html_installed_root = $(htmldir)/libraries endif @@ -139,8 +147,9 @@ endif BOOTSTRAP_LIBS = Cabal filepath BOOTSTRAP_STAMPS = $(addprefix stamp/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)) +BOOTSTRAP_INC = -DCABAL_VERSION=1,3 $(addprefix -i$(FPTOOLS_TOP_ABS)/libraries/bootstrapping.,$(BOOTSTRAP_LIBS)) +DEPLOYMENT_OPTS = $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) \ + $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS)) .PHONY: subdirs @@ -159,27 +168,46 @@ 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 \ - $(BOOTSTRAP_INC_2_UP) + cd $*/setup && $(GHC) $(CABAL_GHC_FLAGS) --make Setup.*hs -o Setup \ + $(BOOTSTRAP_INC) 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) $(DEPLOYMENT_OPTS) +else + cd installPackage && $(GHC) $(CABAL_GHC_FLAGS) \ --make installPackage -o installPackage \ - $(BOOTSTRAP_INC_1_UP) + $(BOOTSTRAP_INC) +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 + +IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/libraries/boot-packages $(BOOTSTRAP_STAMPS): stamp/bootstrapping.%: $(RM) -rf bootstrapping.$* @@ -197,9 +225,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'. @@ -224,29 +256,38 @@ 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=/NONEXISTANT \ - --bindir=/NONEXISTANT \ - --libdir=/NONEXISTANT \ + --prefix=$(NONEXISTENT) \ + --bindir=$(NONEXISTENT) \ + --libdir=$(NONEXISTENT) \ --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 \ + --libexecdir=$(NONEXISTENT) \ + --datadir=$(NONEXISTENT) \ + --docdir=$(NONEXISTENT) \ + --haddockdir=$(NONEXISTENT) \ + --htmldir=$(NONEXISTENT) \ + --with-compiler=$(FPTOOLS_TOP_ABS)/compiler/stage1/ghc-inplace \ + --with-hc-pkg=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg-inplace \ + --with-hsc2hs=$(FPTOOLS_TOP_ABS)/utils/hsc2hs/hsc2hs-inplace \ --with-ld=$(LD) \ --haddock-options="--use-contents=../index.html \ - --use-index=../doc-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 + $(MKDIRHIER) `dirname $@` + ( 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. @@ -258,26 +299,35 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup # 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. -$(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\ +# Packages in $(SUBDIRS_BUILD) need to use the build.* rules instead of +# make.*, so filter them out and use an alternate rule below instead. +$(foreach SUBDIR,$(filter-out $(SUBDIRS_BUILD),$(SUBDIRS)),make.library.$(SUBDIR)):\ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - %/setup/Setup ifBuildable/ifBuildable - if ifBuildable/ifBuildable $*; then \ + %/setup/Setup ifBuildable/ifBuildable installPackage/installPackage + if $(IFBUILDABLE) $*; then \ cd $* && \ - cmp -s ../Makefile.local Makefile.local || cp ../Makefile.local .; \ + 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) && \ - ../installPackage/installPackage register --inplace; \ + setup/Setup register --inplace; \ fi +MAKEFILE_LOCAL = $(FPTOOLS_TOP_ABS)/libraries/Makefile.local + +# Alternate rule, as described above +$(foreach SUBDIR,$(SUBDIRS_BUILD),make.library.$(SUBDIR)):\ +make.library.%: build.library.% + # 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 - if ifBuildable/ifBuildable $*; then \ + if $(IFBUILDABLE) $*; then \ cd $* && \ setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \ + setup/Setup register --inplace; \ fi .PHONY: doc html @@ -295,12 +345,14 @@ endif $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup ifBuildable/ifBuildable - if ifBuildable/ifBuildable $*; then \ + if $(IFBUILDABLE) $*; then \ cd $* && setup/Setup haddock --html-location='../$$pkg' \ $(CABAL_HADDOCK_FLAGS); \ fi ifneq "$(HSCOLOUR)" "" - if ifBuildable/ifBuildable $*; then cp hscolour.css $*/dist/doc/html/$*/src/; fi +# We use */src rather than $*/src due to the $(INTEGER_LIBRARY)/integer +# mismatch + if $(IFBUILDABLE) $*; then cp hscolour.css $*/dist/doc/html/*/src/; fi endif .PHONY: distclean clean clean.library.% @@ -357,9 +409,9 @@ install-docs: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: installPackage/installPackage ifBuildable/ifBuildable - if ifBuildable/ifBuildable $*; then \ + if $(IFBUILDABLE) $*; then \ cd $* && \ - ../installPackage/installPackage install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(iinterfacedir)' ; \ + $(FPTOOLS_TOP_ABS)/libraries/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.% @@ -381,7 +433,7 @@ endif $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \ binary-dist.library.%: - if ifBuildable/ifBuildable $*; then \ + if $(IFBUILDABLE) $*; then \ $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*; \ cd $* && \ cp $*.cabal $(BIN_DIST_LIBDIR)/$* && \