X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=7e1a621e0dd902222885be01ba93679d619b789b;hb=db39fbf447d14801fe8ee4555bf51990944865c4;hp=919bb696b85dda9dd6234fb077e9fc65e710cdc6;hpb=685436101ebe0ec301622d092ff18b1759a1fa12;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index 919bb69..7e1a621 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -9,21 +9,28 @@ # # make clean.library. # make build.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 build.library.foo .PHONY: default_target default_target: build -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 filepath haskell98 template-haskell readline Cabal +SUBDIRS = base old-locale old-time directory process filepath pretty \ + template-haskell readline Cabal random haskell98 ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix @@ -64,6 +71,7 @@ SUBDIRS += $(wildcard arrows) ifeq "$(GhcLibsWithObjectIO)" "YES" SUBDIRS += $(wildcard ObjectIO) endif +SUBDIRS += $(wildcard parallel) endif # ----------------------------------------------------------------------------- @@ -71,11 +79,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 := @@ -90,7 +96,10 @@ CONFIGURE_OPTS += --enable-split-objs CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting endif -BOOTSTRAPPING_STAMPS = $(addprefix stamp/bootstrapping.,Cabal filepath) +BOOTSTRAP_LIBS = Cabal filepath +BOOTSTRAP_STAMPS = $(addprefix stamp/bootstrapping.,$(BOOTSTRAP_LIBS)) +BOOTSTRAP_INC_1_UP = $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS)) +BOOTSTRAP_INC_2_UP = $(addprefix -i../../bootstrapping.,$(BOOTSTRAP_LIBS)) .PHONY: subdirs @@ -99,8 +108,9 @@ subdirs: .PHONY: boot -boot: $(BOOTSTRAPPING_STAMPS) ifBuildable/ifBuildable \ - $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) +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. @@ -109,13 +119,20 @@ boot: $(BOOTSTRAPPING_STAMPS) ifBuildable/ifBuildable \ # We ought to be depending on %/Setup.*hs, but make makes that difficult. $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \ -%/setup/Setup: $(BOOTSTRAPPING_STAMPS) +%/setup/Setup: $(BOOTSTRAP_STAMPS) -$(RM) -rf $*/setup mkdir $*/setup $(CP) $*/Setup.*hs $*/setup - cd $*/setup && $(GHC) -i../../bootstrapping.Cabal \ - -i../../bootstrapping.filepath \ - -Wall -cpp --make Setup.*hs -o 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/ + cd installPackage && $(GHC) -Wall -cpp \ + --make installPackage -o installPackage \ + $(BOOTSTRAP_INC_1_UP) ifBuildable/ifBuildable: ifBuildable.hs -$(RM) -rf ifBuildable @@ -123,7 +140,7 @@ ifBuildable/ifBuildable: ifBuildable.hs $(CP) ifBuildable.hs ifBuildable/ cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable -$(BOOTSTRAPPING_STAMPS): stamp/bootstrapping.%: +$(BOOTSTRAP_STAMPS): stamp/bootstrapping.%: $(RM) -rf bootstrapping.$* $(CP) -R $* bootstrapping.$* $(FIND) bootstrapping.$* \( -name "*.o" -o -name "*.hi" \) \ @@ -138,7 +155,13 @@ ifneq "$(NO_HADDOCK_DOCS)" "YES" all: doc endif +.PHONY: rebuild.library.% + +$(foreach SUBDIR,$(SUBDIRS),rebuild.library.$(SUBDIR)):\ +rebuild.library.%: clean.library.% build.library.% + build: $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)) +build: installPackage/installPackage configure: $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)) @@ -148,13 +171,29 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ # 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" +libsubdir = $$pkgid +else +libsubdir = $$compiler/lib/$$pkgid +endif + $(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) \ + --prefix='$$topdir' \ + --datadir='$$prefix/share' \ + --libsubdir='$(libsubdir)' \ --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) \ @@ -177,6 +216,13 @@ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ $(addprefix --ghc-option=,$(GhcLibHcOpts)) ifBuildable/ifBuildable $* setup/Setup register --inplace +$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/CabalMakefile):\ +%/CabalMakefile: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ + %/setup/Setup ifBuildable/ifBuildable + $(RM) $*/CabalMakefile + ifBuildable/ifBuildable $* setup/Setup makefile -f CabalMakefile \ + $(addprefix --ghc-option=,$(GhcLibHcOpts)) + .PHONY: doc DOC_SUBDIRS = $(filter-out haskell98,$(SUBDIRS)) @@ -189,18 +235,38 @@ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup ifBuildable/ifBuildable ifBuildable/ifBuildable $* setup/Setup haddock +.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 +endif + +# ----------------------------------------------------------------------------- + .PHONY: install install-docs install.library.% -INSTALL_DIR=$(prefix)/share/ghc/doc/html/ +ROOT=$(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) + $(INSTALL_DIR) $(ROOT) + $(INSTALL_DATA) index.html doc-index.html $(ROOT) + $(INSTALL_SCRIPT) gen_contents_index $(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) $(prefix)/share/ghc/doc/html/base/*.css $(ROOT) + $(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.js $(ROOT) + $(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.gif $(ROOT) endif # Cabal doesn't let us ask to install docs only, so do nothing here @@ -210,58 +276,35 @@ 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 ifBuildable/ifBuildable - -$(RM) -f stamp/configure.library.*.$* - 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 ifBuildable/ifBuildable - ifBuildable/ifBuildable $* setup/Setup install +install.library.%: installPackage/installPackage ifBuildable/ifBuildable + ifBuildable/ifBuildable $* ../installPackage/installPackage $(prefix) $(bindir)/ghc-pkg .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) + 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) + 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 + $(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 -