X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=ddbb6f3db79849be858653ccd7bef01e1ab2dfe9;hb=1cb07a46a33f4d2626bc7912e0118322198e5e72;hp=82cf02e979269d90c66b9b55319444e0aa988002;hpb=0d126b9c0dc9299a860fc6bb0e1dee05eb583de2;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index 82cf02e..ddbb6f3 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -1,4 +1,15 @@ +# To do a fresh build: +# +# make clean +# make boot +# make +# +# To rebuild a particular library : +# +# make clean.library. +# make build.library. + .PHONY: default_target default_target: build @@ -12,8 +23,7 @@ TOP=. include $(TOP)/mk/boilerplate.mk endif -SUBDIRS = base filepath haskell98 template-haskell readline \ - regex-base regex-posix regex-compat parsec Cabal +SUBDIRS = base filepath haskell98 template-haskell readline Cabal ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix @@ -25,6 +35,10 @@ endif # Set GhcBootLibs=YES from the command line to work with just the libraries # needed to bootstrap GHC. ifneq "$(GhcBootLibs)" "YES" +SUBDIRS += $(wildcard regex-base) +SUBDIRS += $(wildcard regex-posix) +SUBDIRS += $(wildcard regex-compat) +SUBDIRS += $(wildcard parsec) SUBDIRS += $(wildcard haskell-src) SUBDIRS += $(wildcard html) SUBDIRS += $(wildcard network) @@ -46,6 +60,7 @@ SUBDIRS += $(wildcard ALUT) SUBDIRS += $(wildcard stm) SUBDIRS += $(wildcard xhtml) SUBDIRS += $(wildcard cgi) +SUBDIRS += $(wildcard arrows) ifeq "$(GhcLibsWithObjectIO)" "YES" SUBDIRS += $(wildcard ObjectIO) endif @@ -56,6 +71,12 @@ endif empty= space=$(empty) $(empty) +ifeq "$(Windows)" "YES" +dot_bat=.bat +else +dot_bat= +endif + CONFIGURE_OPTS = CONFIGURE_STAMP_EXTRAS := @@ -64,7 +85,12 @@ CONFIGURE_OPTS += --enable-library-profiling CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-profiling endif -BOOTSTRAPPING_CABAL = bootstrapping.cabal +ifeq "$(SplitObjs)" "YES" +CONFIGURE_OPTS += --enable-split-objs +CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting +endif + +BOOTSTRAPPING_STAMPS = $(addprefix stamp/bootstrapping.,Cabal filepath) .PHONY: subdirs @@ -73,10 +99,8 @@ subdirs: .PHONY: boot -boot: $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) - # XXX Hideous hacks: - $(GENPRIMOP) --make-haskell-source < ../compiler/prelude/primops.txt > base/GHC/Prim.hs - $(GENPRIMOP) --make-haskell-wrappers < ../compiler/prelude/primops.txt > base/GHC/PrimopWrappers.hs +boot: $(BOOTSTRAPPING_STAMPS) ifBuildable/ifBuildable \ + $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) # 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. @@ -85,16 +109,25 @@ boot: $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) # We ought to be depending on %/Setup.*hs, but make makes that difficult. $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \ -%/setup/Setup: stamp/$(BOOTSTRAPPING_CABAL) +%/setup/Setup: $(BOOTSTRAPPING_STAMPS) -$(RM) -rf $*/setup mkdir $*/setup $(CP) $*/Setup.*hs $*/setup - cd $*/setup && $(GHC) --make -i../../$(BOOTSTRAPPING_CABAL) Setup.*hs -o Setup - -stamp/$(BOOTSTRAPPING_CABAL): - $(RM) -rf $(BOOTSTRAPPING_CABAL) - $(CP) -a Cabal $(BOOTSTRAPPING_CABAL) - $(FIND) $(BOOTSTRAPPING_CABAL) \( -name "*.o" -o -name "*.hi" \) -exec $(RM) -f {} \; + cd $*/setup && $(GHC) -i../../bootstrapping.Cabal \ + -i../../bootstrapping.filepath \ + -Wall -cpp --make Setup.*hs -o Setup + +ifBuildable/ifBuildable: ifBuildable.hs + -$(RM) -rf ifBuildable + mkdir ifBuildable + $(CP) ifBuildable.hs ifBuildable/ + cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable + +$(BOOTSTRAPPING_STAMPS): stamp/bootstrapping.%: + $(RM) -rf bootstrapping.$* + $(CP) -R $* bootstrapping.$* + $(FIND) bootstrapping.$* \( -name "*.o" -o -name "*.hi" \) \ + -exec $(RM) -f {} \; touch $@ .PHONY: all build configure @@ -118,21 +151,31 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ $(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.*.$* - cd $* && setup/Setup configure \ - $(CONFIGURE_OPTS) \ - --prefix=$(prefix) \ - --with-compiler=../../compiler/ghc-inplace \ - --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \ - --datasubdir=ghc \ - --haddock-args="--use-contents=../index.html --use-index=../doc-index.html" - touch $@ + -$(RM) -f stamp/configure.library.*.$* $*/unbuildable + ( cd $* && setup/Setup configure \ + $(CONFIGURE_OPTS) \ + --prefix=$(prefix) \ + --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) \ + --with-ld=$(LD) \ + --datasubdir=ghc \ + --haddock-args="--use-contents=../index.html \ + --use-index=../doc-index.html" \ + $(addprefix --configure-option=,$(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 +# build dies! $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - %/setup/Setup - cd $* && setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)) - cd $* && setup/Setup register --inplace + %/setup/Setup ifBuildable/ifBuildable + ifBuildable/ifBuildable $* setup/Setup build \ + $(addprefix --ghc-option=,$(GhcLibHcOpts)) + ifBuildable/ifBuildable $* setup/Setup register --inplace .PHONY: doc @@ -143,20 +186,22 @@ doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)) $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - %/setup/Setup - cd $* && setup/Setup haddock + %/setup/Setup ifBuildable/ifBuildable + ifBuildable/ifBuildable $* setup/Setup haddock .PHONY: install install-docs install.library.% INSTALL_DIR=$(prefix)/share/ghc/doc/html/ install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)) +ifneq "$(NO_HADDOCK_DOCS)" "YES" $(INSTALL_DATA) index.html doc-index.html $(INSTALL_DIR) $(INSTALL_SCRIPT) gen_contents_index $(INSTALL_DIR) # Hacks: $(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.css $(INSTALL_DIR) $(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.js $(INSTALL_DIR) $(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.gif $(INSTALL_DIR) +endif # Cabal doesn't let us ask to install docs only, so do nothing here install-docs: @@ -166,29 +211,55 @@ install-docs: # then we can't change the libraries and then just rerun make. # Thus if you install without building then it will just break. $(foreach SUBDIR,$(SUBDIRS),stamp/configure.library.install.$(SUBDIR)): \ -stamp/configure.library.install.%: %/setup/Setup +stamp/configure.library.install.%: %/setup/Setup ifBuildable/ifBuildable -$(RM) -f stamp/configure.library.*.$* - cd $* && setup/Setup configure $(CONFIGURE_OPTS) \ - --prefix=$(prefix) \ - --with-compiler=$(bindir)/ghc \ - --datasubdir=ghc + ifBuildable/ifBuildable $* setup/Setup configure \ + $(CONFIGURE_OPTS) \ + --prefix=$(prefix) \ + --with-compiler=$(bindir)/ghc \ + --datasubdir=ghc touch $@ # We need to reconfigure as we now need to register with the normal ghc-pkg $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ -install.library.%: stamp/configure.library.install.% %/setup/Setup - cd $* && setup/Setup install +install.library.%: stamp/configure.library.install.% \ + %/setup/Setup ifBuildable/ifBuildable + ifBuildable/ifBuildable $* setup/Setup install + +.PHONY: binary-dist binary-dist.library.% + +BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries + +binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) + cp Makefile $(BIN_DIST_LIBDIR) + 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) + +$(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \ +binary-dist.library.%: + $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*/setup + ifBuildable/ifBuildable $* cp setup/Setup $(BIN_DIST_LIBDIR)/$*/setup + ifBuildable/ifBuildable $* cp $*.cabal $(BIN_DIST_LIBDIR)/$* + ifBuildable/ifBuildable $* cp -a dist $(BIN_DIST_LIBDIR)/$* + ifBuildable/ifBuildable $* find $(BIN_DIST_LIBDIR)/$*/dist \ + \( \( -name "*.o" -o -name "*.p_o" \) -a ! -name "HS*" \) \ + -exec rm {} \; + +.PHONY: distclean clean clean.library.% -.PHONY: clean clean.library.% +distclean: clean clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) - $(RM) -f stamp/$(BOOTSTRAPPING_CABAL) - $(RM) -rf $(BOOTSTRAPPING_CABAL) + $(RM) -f stamp/bootstrapping.* + $(RM) -rf bootstrapping.* + $(RM) -rf ifBuildable $(RM) -f libraries.txt index.html doc-index.html $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \ clean.library.%: - $(RM) -f stamp/configure.library.*.$* + $(RM) -f stamp/configure.library.*.$* $*/unbuildable -cd $* && setup/Setup clean $(RM) -rf $*/setup