X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=417e37d636970af321a985ab8e3dfc36d8647327;hb=d0d51c8b13ea9168ee22fbb7d89b1694f317277c;hp=6734860b9a4b261c5d02fbb09749cf0aa95d407c;hpb=d0cd64ca25c15f72832ebe2379e527a7c7a28e90;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index 6734860..417e37d 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,7 +23,7 @@ TOP=. include $(TOP)/mk/boilerplate.mk endif -SUBDIRS = base filepath haskell98 template-haskell readline Cabal +SUBDIRS = base filepath haskell98 pretty template-haskell readline Cabal ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix @@ -49,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 @@ -78,7 +90,7 @@ CONFIGURE_OPTS += --enable-split-objs CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting endif -BOOTSTRAPPING_CABAL = bootstrapping.cabal +BOOTSTRAPPING_STAMPS = $(addprefix stamp/bootstrapping.,Cabal filepath pretty) .PHONY: subdirs @@ -87,11 +99,9 @@ subdirs: .PHONY: boot -boot: ifBuildable/ifBuildable \ - $(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) \ + 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. @@ -100,23 +110,36 @@ boot: ifBuildable/ifBuildable \ # 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) -Wall --make -i../../$(BOOTSTRAPPING_CABAL) Setup.*hs -o Setup - -ifBuildable/ifBuildable: ifBuildable.hs stamp/$(BOOTSTRAPPING_CABAL) + cd $*/setup && $(GHC) -i../../bootstrapping.Cabal \ + -i../../bootstrapping.filepath \ + -i../../bootstrapping.pretty \ + -Wall -cpp --make Setup.*hs -o Setup + +installPackage/installPackage: installPackage.hs $(BOOTSTRAPPING_STAMPS) + -$(RM) -rf installPackage + mkdir installPackage + $(CP) installPackage.hs installPackage/ + cd installPackage && $(GHC) -Wall -cpp \ + --make installPackage -o installPackage \ + -i../bootstrapping.Cabal \ + -i../bootstrapping.filepath \ + -i../bootstrapping.pretty + +ifBuildable/ifBuildable: ifBuildable.hs -$(RM) -rf ifBuildable mkdir ifBuildable $(CP) ifBuildable.hs ifBuildable/ - cd ifBuildable && $(GHC) -Wall --make -i../$(BOOTSTRAPPING_CABAL) \ - ifBuildable -o ifBuildable + cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable -stamp/$(BOOTSTRAPPING_CABAL): - $(RM) -rf $(BOOTSTRAPPING_CABAL) - $(CP) -R Cabal $(BOOTSTRAPPING_CABAL) - $(FIND) $(BOOTSTRAPPING_CABAL) \( -name "*.o" -o -name "*.hi" \) -exec $(RM) -f {} \; +$(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 @@ -128,6 +151,7 @@ all: doc endif build: $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)) +build: installPackage/installPackage configure: $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)) @@ -140,25 +164,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$(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" \ - --configure-option=--with-cc=$(CC) - 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 $* && ../ifBuildable/ifBuildable setup/Setup build \ + %/setup/Setup ifBuildable/ifBuildable + ifBuildable/ifBuildable $* setup/Setup build \ $(addprefix --ghc-option=,$(GhcLibHcOpts)) - cd $* && ../ifBuildable/ifBuildable setup/Setup register --inplace + ifBuildable/ifBuildable $* setup/Setup register --inplace .PHONY: doc @@ -169,8 +199,8 @@ 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.% @@ -193,32 +223,47 @@ install-docs: # Ideally this would depend on a stamp/build.library.%, but if it does # 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 - -$(RM) -f stamp/configure.library.*.$* - cd $* && ../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 $* && ../ifBuildable/ifBuildable setup/Setup install +install.library.%: installPackage/installPackage ifBuildable/ifBuildable + ifBuildable/ifBuildable $* ../installPackage/installPackage + +.PHONY: binary-dist binary-dist.library.% + +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 + 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)/$* + ifBuildable/ifBuildable $* cp $*.cabal $(BIN_DIST_LIBDIR)/$* + ifBuildable/ifBuildable $* cp -a dist $(BIN_DIST_LIBDIR)/$* + ifBuildable/ifBuildable $* $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \ + \( -name "*_split" -o -name "autogen" \) | xargs rm -rf + 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