X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=2216c968c56ce19765fa8a2c2702d0cd7b497679;hp=51cb7aadcb66fa92d77d296284db050dcfd6d619;hb=9412e62942ebab0599c7fb0b358a9d4869647b67;hpb=a9f9a7544a9605d0af16adf79abdfe8d99b0bb3d diff --git a/libraries/Makefile b/libraries/Makefile index 51cb7aa..2216c96 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 # @@ -37,16 +37,17 @@ show: # for paths and arguments to tools etc, and those set in mk/build.mk. TOP=.. include $(TOP)/mk/boilerplate.mk +include $(TOP)/mk/cabal-flags.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. @@ -61,7 +62,6 @@ SUBDIRS += $(wildcard network) SUBDIRS += $(wildcard QuickCheck) SUBDIRS += $(wildcard HUnit) SUBDIRS += $(wildcard mtl) -SUBDIRS += $(wildcard fgl) SUBDIRS += $(wildcard time) SUBDIRS += $(wildcard OpenGL) SUBDIRS += $(wildcard GLUT) @@ -70,13 +70,17 @@ SUBDIRS += $(wildcard ALUT) SUBDIRS += $(wildcard stm) SUBDIRS += $(wildcard xhtml) SUBDIRS += $(wildcard cgi) -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 +88,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 +102,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 +115,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 @@ -133,74 +143,58 @@ 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 = -DCABAL_VERSION=1,3 $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS)) -BOOTSTRAP_INC_2_UP = -DCABAL_VERSION=1,3 $(addprefix -i../../bootstrapping.,$(BOOTSTRAP_LIBS)) - .PHONY: subdirs subdirs: @echo $(SUBDIRS) -.PHONY: boot +HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries -boot: $(BOOTSTRAP_STAMPS) ifBuildable/ifBuildable \ - $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) \ - installPackage/installPackage - -# 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. - -# We ought to be depending on %/Setup.*hs, but make makes that difficult. - -$(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) - -installPackage/installPackage: installPackage.hs $(BOOTSTRAP_STAMPS) - -$(RM) -rf installPackage - mkdir installPackage - $(CP) installPackage.hs installPackage/ -ifeq "$(UseStage1)" "YES" - cd installPackage && ../$(HC) -Wall -cpp \ - --make installPackage -o installPackage \ - $(BOOTSTRAP_INC_1_UP) -else - cd installPackage && $(GHC) -Wall -cpp \ - --make installPackage -o installPackage \ - $(BOOTSTRAP_INC_1_UP) +IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages + +CABAL_GHC_FLAGS = -Wall +ifeq "$(ghc_ge_605)" "NO" +CABAL_GHC_FLAGS += -cpp 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. + +# Euch, hideous hack: +CABAL_VERSION = $(shell grep "^Version:" Cabal/Cabal.cabal | sed -e "s/^Version: //" -e 's/\./,/g') + +BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -i$(HERE_ABS)/hpc + +.PHONY: boot + +boot: ifBuildable/ifBuildable cabal-bin bootstrapping.conf + +cabal-bin: cabal-bin.hs + $(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal-bin -o cabal-bin + +bootstrapping.conf: cabal-bin + echo "[]" > $@.tmp + -cd filepath && $(CABAL) clean --distpref=dist-bootstrapping + cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp + cd filepath && $(CABAL) build --distpref=dist-bootstrapping + cd filepath && $(CABAL) install --distpref=dist-bootstrapping --inplace + -cd Cabal && $(CABAL) clean --distpref=dist-bootstrapping + cd Cabal && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp + cd Cabal && $(CABAL) build --distpref=dist-bootstrapping + cd Cabal && $(CABAL) install --distpref=dist-bootstrapping --inplace + -cd hpc && $(CABAL) clean --distpref=dist-bootstrapping + cd hpc && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp + cd hpc && $(CABAL) build --distpref=dist-bootstrapping + cd hpc && $(CABAL) install --distpref=dist-bootstrapping --inplace + mv $@.tmp $@ ifBuildable/ifBuildable: ifBuildable.hs -$(RM) -rf ifBuildable mkdir ifBuildable $(CP) ifBuildable.hs ifBuildable/ -ifeq "$(UseStage1)" "YES" +ifeq "$(stage)" "2" cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable else cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable endif -$(BOOTSTRAP_STAMPS): stamp/bootstrapping.%: - $(RM) -rf bootstrapping.$* - $(CP) -R $* bootstrapping.$* - $(FIND) bootstrapping.$* \( -name "*.o" -o -name "*.hi" \) \ - -exec $(RM) -f {} \; - touch $@ - .PHONY: all build configure all: build @@ -210,14 +204,17 @@ 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 configure: $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)) @@ -228,38 +225,21 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ # We should depend on %/%.cabal here (and in other rules), but make # makes that difficult. -# 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. -FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\ - $(space)--configure-option=',\ - $(space)$(CONFIGURE_ARGS)) +ALL_CONFIGURE_FLAGS = \ + $(INSTALL_DIRS_CONFIGURE_FLAGS) \ + $(USE_STAGE1_CONFIGURE_FLAGS) \ + $(COMMON_CONFIGURE_FLAGS) \ + --haddock-options="--use-contents=../index.html \ + --use-index=../doc-index.html" \ + $(CONFIGURE_OPTS) $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \ -stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup +stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin \ + bootstrapping.conf -$(RM) -f stamp/configure.library.*.$* $*/unbuildable - ( cd $* && setup/Setup configure \ - $(CONFIGURE_OPTS) \ - --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) \ - --haddock-options="--use-contents=../index.html \ - --use-index=../doc-index.html" \ - $(FLAGGED_CONFIGURE_ARGS) \ - --configure-option=--with-cc=$(CC) ) \ + $(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. @@ -271,26 +251,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 bootstrapping.conf + 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) && \ - ../installPackage/installPackage 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 bootstrapping.conf + if $(IFBUILDABLE) $*; then \ cd $* && \ - setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \ + $(CABAL) build $(BUILD_FLAGS); \ + $(CABAL) register --inplace; \ fi .PHONY: doc html @@ -307,13 +296,15 @@ 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 bootstrapping.conf + if $(IFBUILDABLE) $*; then \ + cd $* && $(CABAL) 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.% @@ -321,10 +312,14 @@ endif distclean: clean clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) - $(RM) -f stamp/bootstrapping.* - $(RM) -rf bootstrapping.* + -cd filepath && $(CABAL) clean --distpref=dist-bootstrapping + -cd Cabal && $(CABAL) clean --distpref=dist-bootstrapping + -cd hpc && $(CABAL) clean --distpref=dist-bootstrapping + $(RM) -rf bootstrapping/* + $(RM) -f bootstrapping.conf bootstrapping.conf.old + $(RM) -f bootstrapping.conf.tmp bootstrapping.conf.tmp.old + $(RM) -f cabal-bin cabal-bin.exe $(RM) -rf ifBuildable - $(RM) -rf installPackage $(RM) -f libraries.txt index.html doc-index.html doc-index*.html $(RM) -f haddock* *.gif @@ -334,8 +329,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 @@ -369,10 +364,10 @@ install-docs: # overridden when installing a bindist. $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ -install.library.%: installPackage/installPackage ifBuildable/ifBuildable - if ifBuildable/ifBuildable $*; then \ +install.library.%: ifBuildable/ifBuildable + if $(IFBUILDABLE) $*; then \ cd $* && \ - ../installPackage/installPackage install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(iinterfacedir)' ; \ + $(INSTALL_PACKAGE) 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.% @@ -380,8 +375,6 @@ install.library.%: installPackage/installPackage ifBuildable/ifBuildable BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) - mkdir $(BIN_DIST_LIBDIR)/installPackage - cp installPackage/installPackage $(BIN_DIST_LIBDIR)/installPackage mkdir $(BIN_DIST_LIBDIR)/ifBuildable cp ifBuildable/ifBuildable $(BIN_DIST_LIBDIR)/ifBuildable cp Makefile $(BIN_DIST_LIBDIR) @@ -394,7 +387,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)/$* && \