X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=b58777db51cccd3db0c9d62ca4179a8bedd77f0b;hb=efe7a8d4719fb2e6f53126d834dff2b6831ad662;hp=3e29f6bebf022c6bc4fa3a5caeadd3a00dac04e0;hpb=8b23f67d60248675c3bdc3fa15577b66c31fa339;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index 3e29f6b..b58777d 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,16 @@ 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-interface) +SUBDIRS_BUILD += $(wildcard dph/dph-prim-seq) +SUBDIRS_BUILD += $(wildcard dph/dph-prim-par) +SUBDIRS_BUILD += $(wildcard dph/dph) endif +SUBDIRS += $(SUBDIRS_BUILD) + # ----------------------------------------------------------------------------- empty= @@ -84,6 +91,10 @@ space=$(empty) $(empty) # ----------------------------------------------------------------------------- +ifeq "$(ghc_ge_609)" "YES" +GhcLibHcOpts += -fno-warn-deprecated-flags +endif + 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 @@ -94,9 +105,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 +118,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 @@ -137,10 +150,8 @@ ifneq "$(HSCOLOUR)" "" CONFIGURE_OPTS += --with-hscolour=$(HSCOLOUR) 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)) +DEPLOYMENT_OPTS = $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) \ + $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS)) .PHONY: subdirs @@ -149,44 +160,49 @@ subdirs: .PHONY: boot -boot: $(BOOTSTRAP_STAMPS) ifBuildable/ifBuildable \ - $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) \ - installPackage/installPackage +boot: ifBuildable/ifBuildable cabal-bin ghc-prim/Setup + +HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries + +IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages +CABAL=$(HERE_ABS)/cabal-bin + +CABAL_GHC_FLAGS = -Wall +ifeq "$(ghc_ge_605)" "NO" +CABAL_GHC_FLAGS += -cpp +endif -# We build the Setup program in a setup subdirectory to stop it trying -# to use bits of base and Cabal when we build those packages. -# This also makes it slightly easier to clean. +BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=1,3 -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -# We ought to be depending on %/Setup.*hs, but make makes that difficult. +# We use -main-is so that GHC doesn't get confused and think +# Main.hi/Main.o from cabal belongs to ghc-prim/Setup, or vice-versa. +cabal-bin: cabal-bin.hs + $(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal-bin -o cabal-bin -main-is Cabal -$(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) +# ghc-prim/Setup doesn't really depend on cabal-bin, but pretending that it +# does sequentialises building the two of them, which is nice given +# they're sharing -odir and -hidir. +ghc-prim/Setup: ghc-prim/Setup.hs cabal-bin + cd ghc-prim && $(GHC) $(BOOTSTRAPPING_FLAGS) --make Setup -o Setup -installPackage/installPackage: installPackage.hs $(BOOTSTRAP_STAMPS) +installPackage/installPackage: installPackage.hs -$(RM) -rf installPackage mkdir installPackage $(CP) installPackage.hs installPackage/ - cd installPackage && $(GHC) -Wall -cpp \ - --make installPackage -o installPackage \ - $(BOOTSTRAP_INC_1_UP) + cd installPackage && $(FPTOOLS_TOP_ABS)/compiler/stage1/ghc-inplace \ + --make installPackage -o installPackage \ + $(DEPLOYMENT_OPTS) 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 - -$(BOOTSTRAP_STAMPS): stamp/bootstrapping.%: - $(RM) -rf bootstrapping.$* - $(CP) -R $* bootstrapping.$* - $(FIND) bootstrapping.$* \( -name "*.o" -o -name "*.hi" \) \ - -exec $(RM) -f {} \; - touch $@ +endif .PHONY: all build configure @@ -197,14 +213,18 @@ 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'. -build: $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)) -build: installPackage/installPackage +build: $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)) \ + installPackage/installPackage configure: $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)) @@ -224,29 +244,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).%: cabal-bin + -$(RM) -f stamp/configure.library.*.$* $*/unbuildable + $(MKDIRHIER) `dirname $@` + ( cd $* && $(CABAL) 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 +287,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 \ + cabal-bin ifBuildable/ifBuildable + 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; \ + $(CABAL) makefile -f GNUmakefile; \ cmp -s GNUmakefile GNUmakefile.tmp && mv GNUmakefile.tmp GNUmakefile; \ $(MAKE) $(MFLAGS) && \ - setup/Setup register --inplace; \ + $(CABAL) 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 \ + cabal-bin ifBuildable/ifBuildable + if $(IFBUILDABLE) $*; then \ cd $* && \ - setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \ + $(CABAL) build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \ + $(CABAL) register --inplace; \ fi .PHONY: doc html @@ -294,19 +332,24 @@ 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' \ - $(CABAL_HADDOCK_FLAGS); \ + cabal-bin ifBuildable/ifBuildable + if $(IFBUILDABLE) $*; then \ + cd $* && $(CABAL) 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) $*; then cp hscolour.css $*/dist/doc/html/*/src/; fi +endif .PHONY: distclean clean clean.library.% distclean: clean clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) - $(RM) -f stamp/bootstrapping.* - $(RM) -rf bootstrapping.* + $(RM) -rf bootstrapping/* + $(RM) -f cabal-bin $(RM) -rf ifBuildable $(RM) -rf installPackage $(RM) -f libraries.txt index.html doc-index.html doc-index*.html @@ -318,8 +361,8 @@ distclean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \ clean.library.%: $(RM) -f stamp/configure.library.*.$* $*/unbuildable - -cd $* && setup/Setup clean - $(RM) -rf $*/setup + -cd $* && $(CABAL) clean + $(RM) -f $*/Setup $*/Setup.exe $*/Setup.hi $*/Setup.o $(RM) $*/GNUmakefile $*/Makefile.local endif @@ -354,16 +397,17 @@ install-docs: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: installPackage/installPackage ifBuildable/ifBuildable - if ifBuildable/ifBuildable $*; then \ + if $(IFBUILDABLE) $*; then \ cd $* && \ - ../installPackage/installPackage '$(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.% BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries -binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) +binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) \ + installPackage/installPackage mkdir $(BIN_DIST_LIBDIR)/installPackage cp installPackage/installPackage $(BIN_DIST_LIBDIR)/installPackage mkdir $(BIN_DIST_LIBDIR)/ifBuildable @@ -378,7 +422,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)/$* && \