X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=b3f98081573351ced6950a6b2442706a6cdfc76d;hp=db8c22ed7f3ce3444e69b03c6efcebfb68d4886c;hb=8a2809c29de9f23eba7ca682b48390033a9d40f6;hpb=4165630491936a879196ec7229ce895191eabc45 diff --git a/libraries/Makefile b/libraries/Makefile index db8c22e..b3f9808 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -8,27 +8,35 @@ # To rebuild a particular library : # # make clean.library. -# make build.library. +# make make.library. # # or the following is equivalent: # # make rebuild.library. +# +# To add a new library to the tree, do +# +# darcs get http://darcs.haskell.org/packages/foo +# [ -e foo/configure.ac ] && ( cd foo && autoreconf ) +# make make.library.foo .PHONY: default_target -default_target: build +default_target: all + +# make doesn't give us an easy way to get the libraries built in +# dependency order the first time, but not rebuild base (for example) +# when we want to rebuild another library later. +# So for now we just don't do anything in parallel in here. +.NOTPARALLEL: -ifeq "$(IN_BIN_DIST)" "1" -include ../Makefile-vars -else # Ideally we'd just include something to give us variables # for paths and arguments to tools etc, and those set in mk/build.mk. -TOP=. +TOP=.. include $(TOP)/mk/boilerplate.mk -endif -SUBDIRS = base old-time directory filepath pretty template-haskell \ - readline Cabal random haskell98 +SUBDIRS = base old-locale old-time filepath directory process pretty \ + hpc template-haskell readline Cabal random haskell98 ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix @@ -70,6 +78,7 @@ ifeq "$(GhcLibsWithObjectIO)" "YES" SUBDIRS += $(wildcard ObjectIO) endif SUBDIRS += $(wildcard parallel) +SUBDIRS += $(wildcard ndp) endif # ----------------------------------------------------------------------------- @@ -77,11 +86,9 @@ endif empty= space=$(empty) $(empty) -ifeq "$(Windows)" "YES" -dot_bat=.bat -else -dot_bat= -endif +# ----------------------------------------------------------------------------- + +ifneq "$(DOING_BIN_DIST)" "YES" CONFIGURE_OPTS = CONFIGURE_STAMP_EXTRAS := @@ -151,41 +158,71 @@ $(BOOTSTRAP_STAMPS): stamp/bootstrapping.%: all: build -ifneq "$(NO_HADDOCK_DOCS)" "YES" +ifeq "$(HADDOCK_DOCS)" "YES" all: doc endif .PHONY: rebuild.library.% $(foreach SUBDIR,$(SUBDIRS),rebuild.library.$(SUBDIR)):\ -rebuild.library.%: clean.library.% build.library.% +rebuild.library.%: clean.library.% make.library.% -build: $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)) +# 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)) .PHONY: build.library.% +.PHONY: make.library.% # We should depend on %/%.cabal here (and in other rules), but make # makes that difficult. +# We explicitly set datadir to "$prefix/share" as, while that is the +# default on Linux, on Windows it defaults to +# "C:\\Program Files\\Common Files" + +# We also set libsubdir differently on Windows and non-Windows, as on +# non-Windows the path we deduce is highre up than the path passed to +# the executable with the shell script on non-Windows. This should +# probably be tidied up so that we can always pass the same libsubdir. +ifeq "$(Windows)" "YES" +DATA_REL_DIR = . +datadir = $$prefix +libsubdir = $$pkgid +else +DATA_REL_DIR = share/ghc +datadir = $$prefix/share/ghc +libsubdir = $$compiler/lib/$$pkgid +endif +DOC_ROOT = $(prefix)/$(DATA_REL_DIR)/doc/html/ + +# 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)) + $(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 \ $(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) \ + --prefix='$$topdir' \ + --datadir='$(datadir)' \ + --datasubdir='.' \ + --libsubdir='$(libsubdir)' \ + --with-compiler=../../compiler/stage1/ghc-inplace$ \ + --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$ \ + --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \ --with-ld=$(LD) \ - --datasubdir=ghc \ --haddock-args="--use-contents=../index.html \ --use-index=../doc-index.html" \ - $(addprefix --configure-option=,$(CONFIGURE_ARGS)) \ + $(FLAGGED_CONFIGURE_ARGS) \ --configure-option=--with-cc=$(CC) ) \ && touch $@ || touch $*/unbuildable # We don't touch $@ if configure failed as we would prefer to try @@ -193,12 +230,27 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup # This is particularly important for corelibs, where failure means the # build dies! +# Build the library using 'make' +$(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\ +make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ + %/GNUmakefile \ + %/setup/Setup ifBuildable/ifBuildable + ifBuildable/ifBuildable $* $(MAKE) + ifBuildable/ifBuildable $* setup/Setup register --inplace + +# 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 ifBuildable/ifBuildable $* setup/Setup build \ $(addprefix --ghc-option=,$(GhcLibHcOpts)) - ifBuildable/ifBuildable $* setup/Setup register --inplace + +$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\ +%/GNUmakefile: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ + %/setup/Setup ifBuildable/ifBuildable + $(RM) $*/GNUmakefile + cp Makefile.local $* + ifBuildable/ifBuildable $* setup/Setup makefile -f GNUmakefile .PHONY: doc @@ -212,18 +264,38 @@ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup ifBuildable/ifBuildable ifBuildable/ifBuildable $* setup/Setup haddock -.PHONY: install install-docs install.library.% +.PHONY: distclean clean clean.library.% -INSTALL_DIR=$(prefix)/share/ghc/doc/html/ +distclean: clean + +clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) + $(RM) -f stamp/bootstrapping.* + $(RM) -rf bootstrapping.* + $(RM) -rf ifBuildable + $(RM) -rf installPackage + $(RM) -f libraries.txt index.html doc-index.html + +$(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \ +clean.library.%: + $(RM) -f stamp/configure.library.*.$* $*/unbuildable + -cd $* && setup/Setup clean + $(RM) -rf $*/setup + $(RM) $*/GNUmakefile $*/Makefile.local +endif + +# ----------------------------------------------------------------------------- + +.PHONY: install install-docs install.library.% 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) +ifeq "$(HADDOCK_DOCS)" "YES" + $(INSTALL_DIR) $(DOC_ROOT) + $(INSTALL_DATA) index.html doc-index.html $(DOC_ROOT) + $(INSTALL_SCRIPT) gen_contents_index $(DOC_ROOT) # 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) + $(INSTALL_DATA) $(DOC_ROOT)/base/*.css $(DOC_ROOT) + $(INSTALL_DATA) $(DOC_ROOT)/base/*.js $(DOC_ROOT) + $(INSTALL_DATA) $(DOC_ROOT)/base/*.gif $(DOC_ROOT) endif # Cabal doesn't let us ask to install docs only, so do nothing here @@ -235,7 +307,7 @@ install-docs: # Thus if you install without building then it will just break. $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: installPackage/installPackage ifBuildable/ifBuildable - ifBuildable/ifBuildable $* ../installPackage/installPackage + ifBuildable/ifBuildable $* ../installPackage/installPackage $(prefix) $(bindir)/ghc-pkg .PHONY: binary-dist binary-dist.library.% @@ -244,6 +316,8 @@ 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) cp gen_contents_index $(BIN_DIST_LIBDIR) cp index.html $(BIN_DIST_LIBDIR) @@ -255,25 +329,11 @@ binary-dist.library.%: $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$* ifBuildable/ifBuildable $* cp $*.cabal $(BIN_DIST_LIBDIR)/$* ifBuildable/ifBuildable $* cp -a dist $(BIN_DIST_LIBDIR)/$* + # Euch + ifBuildable/ifBuildable $* cp -aL include $(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.% - -distclean: clean - -clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) - $(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.*.$* $*/unbuildable - -cd $* && setup/Setup clean - $(RM) -rf $*/setup -