X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=ea574e11064720ca356b06dafc9602de80ce4237;hb=2a4d586c8abefa2b0d2a782c421697fd6cf0c964;hp=f6e0f29961eff6d09501446e3f08975658ea92f4;hpb=e63653ad05e8123dc9d6df8f9ba891e0021ff71e;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index f6e0f29..ea574e1 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -1,25 +1,52 @@
 
-.PHONY: default_target
+# To do a fresh build:
+#
+#   make clean
+#   make boot
+#   make
+#
+# To rebuild a particular library <package>:
+#
+#   make clean.library.<package>
+#   make make.library.<package>
+#
+# or the following is equivalent:
+#
+#   make rebuild.library.<package>
+#
+# 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 show
+
+default_target: all
+
+show:
+	@echo '$(VALUE)="$($(VALUE))"'
+
+# 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:
 
-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 array packedstring containers bytestring
+SUBDIRS += 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
 
 # Set GhcBootLibs=YES from the command line to work with just the libraries
 # needed to bootstrap GHC.
@@ -35,13 +62,7 @@ SUBDIRS += $(wildcard QuickCheck)
 SUBDIRS += $(wildcard HUnit)
 SUBDIRS += $(wildcard mtl)
 SUBDIRS += $(wildcard fgl)
-SUBDIRS += $(wildcard X11)
 SUBDIRS += $(wildcard time)
-ifeq "$(Windows)" "NO"
-# HGL is not working on Win32, so omit it for now.  Better not to ship it
-# at all than to ship a broken version.
-SUBDIRS += $(wildcard HGL)
-endif
 SUBDIRS += $(wildcard OpenGL)
 SUBDIRS += $(wildcard GLUT)
 SUBDIRS += $(wildcard OpenAL)
@@ -52,6 +73,8 @@ SUBDIRS += $(wildcard cgi)
 ifeq "$(GhcLibsWithObjectIO)" "YES"
 SUBDIRS += $(wildcard ObjectIO)
 endif
+SUBDIRS += $(wildcard parallel)
+SUBDIRS += $(wildcard ndp)
 endif
 
 # -----------------------------------------------------------------------------
@@ -59,12 +82,39 @@ endif
 empty=
 space=$(empty) $(empty)
 
-ifeq "$(Windows)" "YES"
-dot_bat=.bat
+# -----------------------------------------------------------------------------
+
+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
+# where the user tells us to put the haddock documentation and put it
+# somewhere whose relative location we know. When installing we need
+# to give Cabal a real path, though.
+iprefix             = $$topdir
+ibindir             = $$topdir
+ilibdir             = $$topdir
+ilibexecdir         = $$topdir
+idatadir            = $$topdir
+idocdir             = $$topdir/doc/libraries/$$pkgid
+iinterfacedir       = $$topdir/doc/libraries/$$pkgid
+ihtmldir            = $$httptopdir/doc/libraries/$$pkgid
+html_installed_root = $(prefix)/doc/libraries
 else
-dot_bat=
+# On non-Windows we can just give absolute paths all the time, and
+# thus obey the htmldir that we are given.
+iprefix             = $(prefix)
+ibindir             = $(bindir)
+ilibdir             = $(libdir)
+ilibexecdir         = $(libexecdir)
+idatadir            = $(datadir)
+idocdir             = $(docdir)/libraries/$$pkgid
+iinterfacedir       = $(htmldir)/libraries/$$pkgid
+ihtmldir            = $(htmldir)/libraries/$$pkgid
+html_installed_root = $(htmldir)/libraries
 endif
 
+ifneq "$(DOING_BIN_DIST)" "YES"
+
 CONFIGURE_OPTS =
 CONFIGURE_STAMP_EXTRAS :=
 
@@ -73,12 +123,20 @@ CONFIGURE_OPTS += --enable-library-profiling
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-profiling
 endif
 
+ifneq "$(findstring $(space)dyn$(space), $(space)$(GhcLibWays)$(space))" ""
+CONFIGURE_OPTS += --enable-shared
+CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-shared
+endif
+
 ifeq "$(SplitObjs)" "YES"
 CONFIGURE_OPTS += --enable-split-objs
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
 endif
 
-BOOTSTRAPPING_CABAL = bootstrapping.cabal
+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
 
@@ -87,11 +145,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: $(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.
@@ -100,91 +156,178 @@ 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: $(BOOTSTRAP_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) -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
 	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 {} \;
+$(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
 
-ifneq "$(NO_HADDOCK_DOCS)" "YES"
+ifeq "$(HADDOCK_DOCS)" "YES"
 all: doc
 endif
 
-build: $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR))
+.PHONY: rebuild.library.%
+
+$(foreach SUBDIR,$(SUBDIRS),rebuild.library.$(SUBDIR)):\
+rebuild.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))
 
 .PHONY: build.library.%
+.PHONY: make.library.%
 
 # 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))
+
 $(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" \
-	                     $(addprefix --configure-option=,$(CONFIGURE_ARGS)) \
-	                     --configure-option=--with-cc=$(CC)
-	touch $@
-
+	-$(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) ) \
+	      && 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 bootlibs, 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
+	if ifBuildable/ifBuildable $*; then \
+	  cd $* && \
+	  $(MAKE) $(MFLAGS) && \
+	  setup/Setup register --inplace; \
+	fi
+
+# 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
-	cd $* && ../ifBuildable/ifBuildable setup/Setup build \
-	                                $(addprefix --ghc-option=,$(GhcLibHcOpts))
-	cd $* && ../ifBuildable/ifBuildable setup/Setup register --inplace
+                 %/setup/Setup ifBuildable/ifBuildable
+	if ifBuildable/ifBuildable $*; then \
+	  cd $* && \
+	  setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \
+	fi
+
+$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\
+%/GNUmakefile: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
+                 %/setup/Setup ifBuildable/ifBuildable
+	$(RM) $*/GNUmakefile
+	cp Makefile.local $*
+	if ifBuildable/ifBuildable $*; then \
+	   cd $* && setup/Setup makefile -f GNUmakefile; \
+	fi
 
-.PHONY: doc
+.PHONY: doc html
 
-DOC_SUBDIRS = $(filter-out haskell98,$(SUBDIRS))
+html: doc
 
 doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
-	sh gen_contents_index
+	sh gen_contents_index --inplace
 
 $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
-               %/setup/Setup
-	cd $* && ../ifBuildable/ifBuildable setup/Setup haddock
+               %/setup/Setup ifBuildable/ifBuildable
+	if ifBuildable/ifBuildable $*; then \
+	  cd $* && setup/Setup haddock --html-location='../$$pkgid'; \
+	fi
 
-.PHONY: install install-docs install.library.%
+.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) -rf installPackage
+	$(RM) -f libraries.txt index.html doc-index.html doc-index*.html
+	$(RM) -f haddock* *.gif
 
-INSTALL_DIR=$(prefix)/share/ghc/doc/html/
+distclean:
+	$(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak)
+
+$(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)                                                     $(DESTDIR)$(html_installed_root)
+	$(INSTALL_DATA)   index.html doc-index*.html                       $(DESTDIR)$(html_installed_root)
+	$(INSTALL_SCRIPT) gen_contents_index                               $(DESTDIR)$(html_installed_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)   base/dist/doc/html/*/*.css $(DESTDIR)$(html_installed_root)
+	$(INSTALL_DATA)   base/dist/doc/html/*/*.js $(DESTDIR)$(html_installed_root)
+	$(INSTALL_DATA)   base/dist/doc/html/*/*.gif $(DESTDIR)$(html_installed_root)
 endif
 
 # Cabal doesn't let us ask to install docs only, so do nothing here
@@ -194,34 +337,61 @@ 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
+# prefix and (on Windows) htmldir use $topdir when configuring, so we
+# need to tell installPackage the real path to use when installing.
 
-.PHONY: distclean clean clean.library.%
+# We also need to pass all the other directories in, as they can be
+# overridden when installing a bindist.
 
-distclean: clean
-
-clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
-	$(RM) -f stamp/$(BOOTSTRAPPING_CABAL)
-	$(RM) -rf $(BOOTSTRAPPING_CABAL)
-	$(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.*.$*
-	-cd $* && setup/Setup clean
-	$(RM) -rf $*/setup
+$(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
+install.library.%: installPackage/installPackage ifBuildable/ifBuildable
+	if ifBuildable/ifBuildable $*; then \
+	  cd $* && \
+	  ../installPackage/installPackage '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(iinterfacedir)' ; \
+	fi
+
+.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
+	mkdir                               $(BIN_DIST_LIBDIR)/ifBuildable
+	cp 	  ifBuildable/ifBuildable       $(BIN_DIST_LIBDIR)/ifBuildable
+	cp    Makefile                      $(BIN_DIST_LIBDIR)
+ifeq "$(HADDOCK_DOCS)" "YES"
+	cp    gen_contents_index            $(BIN_DIST_LIBDIR)
+	cp    index.html                    $(BIN_DIST_LIBDIR)
+	cp    doc-index*.html               $(BIN_DIST_LIBDIR)
+endif
+	cp -pR stamp                         $(BIN_DIST_LIBDIR)
+	# This gets used in the compiler directory to see if GHC should
+	# depend on the readline package or not
+	$(MKDIRHIER) $(BIN_DIST_LIBDIR)/readline
+	cp    readline/config.mk            $(BIN_DIST_LIBDIR)/readline
+
+$(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \
+binary-dist.library.%:
+	if ifBuildable/ifBuildable $*; then \
+	  $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*; \
+	  cd $* && \
+	  cp    $*.cabal      $(BIN_DIST_LIBDIR)/$* && \
+	  cp    LICENSE       $(BIN_DIST_LIBDIR)/$* && \
+	  cp -R dist          $(BIN_DIST_LIBDIR)/$* && \
+	  $(FIND) . -name "*.buildinfo" -exec cp {} $(BIN_DIST_LIBDIR)/$* \; && \
+	  (cp -RL include      $(BIN_DIST_LIBDIR)/$* || true) && \
+	  $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
+	     \( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \
+	  $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
+	     \( \( -name "*.o" -o -name "*.p_o" \) -a ! -name "HS*" \) \
+	     -exec rm {} \; ; \
+	fi
+
+# Ignore some doc targets that we don't support
+# The root recurses into us when these targets are made
+.PHONY: html-no-chunks chm HxS fo dvi ps pdf
+html-no-chunks chm HxS fo dvi ps pdf:
+	@: