X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=8d9bd710d50191bc98af67c98cf9fef4b0856aa5;hp=87228836225772bd21fc5b9f1156c544b439fba5;hb=ae1d4548d997731878e8c1220fc996a79f47a3e3;hpb=9c1e26118f6dbb0dfb04d08e04eb31fa5c2d1f05

diff --git a/libraries/Makefile b/libraries/Makefile
index 8722883..8d9bd71 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -1,141 +1,329 @@
-# -----------------------------------------------------------------------------
 
-TOP=.
-include $(TOP)/mk/boilerplate.mk
+# 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
+
+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:
 
-# The Cabal package has a GNUmakefile for standalone building, but we
-# want the Makefile.
-MFLAGS += -f Makefile
+# 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=..
+include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = base haskell98 template-haskell
+SUBDIRS = base old-locale old-time directory process filepath pretty \
+          template-haskell readline Cabal random haskell98
 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
 endif
-
-SUBDIRS += Cabal
-SUBDIRS += $(wildcard parsec)
+ifeq "$(Windows)" "YES"
+SUBDIRS += $(wildcard Win32)
+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 time)
+SUBDIRS += $(wildcard html)
 SUBDIRS += $(wildcard network)
 SUBDIRS += $(wildcard QuickCheck)
 SUBDIRS += $(wildcard HUnit)
 SUBDIRS += $(wildcard mtl)
 SUBDIRS += $(wildcard fgl)
 SUBDIRS += $(wildcard X11)
-ifeq "$(Windows)" "YES"
-SUBDIRS += $(wildcard Win32)
-endif
+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)
 SUBDIRS += $(wildcard ALUT)
 SUBDIRS += $(wildcard stm)
+SUBDIRS += $(wildcard xhtml)
+SUBDIRS += $(wildcard cgi)
+SUBDIRS += $(wildcard arrows)
 ifeq "$(GhcLibsWithObjectIO)" "YES"
 SUBDIRS += $(wildcard ObjectIO)
 endif
+SUBDIRS += $(wildcard parallel)
+SUBDIRS += $(wildcard ndp)
 endif
 
-ifeq "$(GhcLibsWithReadline)" "YES"
-SUBDIRS += $(wildcard readline)
-endif
+# -----------------------------------------------------------------------------
+
+empty=
+space=$(empty) $(empty)
 
 # -----------------------------------------------------------------------------
 
-DIST_CLEAN_FILES += config.cache config.status
+ifneq "$(DOING_BIN_DIST)" "YES"
+
+CONFIGURE_OPTS =
+CONFIGURE_STAMP_EXTRAS :=
+
+ifneq "$(findstring $(space)p$(space), $(space)$(GhcLibWays)$(space))" ""
+CONFIGURE_OPTS += --enable-library-profiling
+CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-profiling
+endif
+
+ifeq "$(SplitObjs)" "YES"
+CONFIGURE_OPTS += --enable-split-objs
+CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
+endif
+
+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
+
+subdirs:
+	@echo $(SUBDIRS)
+
+.PHONY: boot
+
+boot: $(BOOTSTRAP_STAMPS) ifBuildable/ifBuildable \
+	  $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) \
+	  $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile) \
+	  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.
+# This also makes it slightly easier to clean.
+
+# We ought to be depending on %/Setup.*hs, but make makes that difficult.
+
+$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
+%/setup/Setup: $(BOOTSTRAP_STAMPS)
+	-$(RM) -rf $*/setup
+	mkdir $*/setup
+	$(CP) $*/Setup.*hs $*/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
+	mkdir ifBuildable
+	$(CP) ifBuildable.hs ifBuildable/
+	cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
+
+$(BOOTSTRAP_STAMPS): stamp/bootstrapping.%:
+	$(RM) -rf bootstrapping.$*
+	$(CP) -R $* bootstrapping.$*
+	$(FIND) bootstrapping.$* \( -name "*.o" -o -name "*.hi" \) \
+	                         -exec $(RM) -f {} \;
+	touch $@
 
-include $(TOP)/mk/target.mk
+.PHONY: all build configure
+
+all: build
+
+ifeq "$(HADDOCK_DOCS)" "YES"
+all: doc
+endif
+
+.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 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='$$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) \
+	           --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!
+
+# 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))
+
+$(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
+
+DOC_SUBDIRS = $(filter-out haskell98,$(SUBDIRS))
+
+doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
+	sh gen_contents_index
+
+$(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
+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
 
 # -----------------------------------------------------------------------------
-# Generating the combined contents/index pages for the library docs
-
-ifneq "$(NO_HADDOCK_DOCS)" "YES"
-
-HTML_DIR = html
-
-# ATTENTION, incomprehensible shell stuff ahead: Automagically create the
-# prologue for the combined index via a header, the package prologues (in
-# alphabetical order of the packages) and a footer. Not very nice, but much
-# better than redundancy or a strong coupling with the packages.
-libraries.txt: libraries-header.txt libraries-footer.txt $(foreach f,package.conf.in prologue.txt,$(addsuffix /$(f),$(SUBDIRS)))
-	$(RM) $@
-	( cat libraries-header.txt ; echo ; \
-	for i in `for j in $(SUBDIRS) ; do echo $$j ; done | $(SORT) -f` ; do \
-	   if test -f $$i/$$i.haddock; then \
-	      echo "[@$$i@]"; \
-	      grep -v '^ *$$' $$i/prologue.txt; \
-	      echo; \
-	   fi; \
-	done ; \
-	cat libraries-footer.txt ; echo ) > $@
-
-CLEAN_FILES += libraries.txt
-
-$(HTML_DIR)/index.html : libraries.txt
-	@$(INSTALL_DIR) $(HTML_DIR)
-	$(HADDOCK) --gen-index --gen-contents -o $(HTML_DIR) \
-		$(HADDOCK_OPTS) \
-		-t "Haskell Hierarchical Libraries" \
-		-p libraries.txt \
-		$(foreach pkg, $(filter-out haskell98,$(SUBDIRS)), \
-		   $(foreach p, $(wildcard $(pkg)/$(pkg).haddock), \
-		      --read-interface=$(pkg),$(pkg)/$(pkg).haddock))
-
-html :: $(HTML_DIR)/index.html
-
-libraries.HxS : libraries.txt
-	@$(INSTALL_DIR) $(HTML_DIR)
-	$(HADDOCK) --gen-index --gen-contents -o $(HTML_DIR) \
-		$(HADDOCK_OPTS) \
-		-t "Haskell Hierarchical Libraries" \
-		-p libraries.txt \
-		-k libraries \
-		--html-help=mshelp2 \
-		$(foreach pkg, $(filter-out haskell98,$(SUBDIRS)), \
-		   $(foreach p, $(wildcard $(pkg)/$(pkg).haddock), \
-		      --read-interface=$(pkg),$(pkg)/$(pkg).haddock))
-	( cd $(HTML_DIR) && if Hxcomp -p libraries.HxC -o ../$@ ; then false ; else true ; fi ) || true
-
-libraries.chm : libraries.txt
-	@$(INSTALL_DIR) $(HTML_DIR)
-	$(HADDOCK) --gen-index --gen-contents -o $(HTML_DIR) \
-		$(HADDOCK_OPTS) \
-		-t "Haskell Hierarchical Libraries" \
-		-p libraries.txt \
-		-k libraries \
-		--html-help=mshelp \
-		$(foreach pkg, $(filter-out haskell98,$(SUBDIRS)), \
-		   $(foreach p, $(wildcard $(pkg)/$(pkg).haddock), \
-		      --read-interface=$(pkg),$(pkg)/$(pkg).haddock))
-	( cd $(HTML_DIR) && if hhc libraries.hhp ; then false ; else true ; fi && mv libraries.chm .. ) || true
-
-HxS :: libraries.HxS
-chm :: libraries.chm
-
-install-docs :: $(HTML_DIR)/index.html
-	$(INSTALL_DIR) $(datadir)/html/libraries; \
-	for i in $(HTML_DIR)/*; do \
-		if test -f $$i; then \
-		  echo $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/libraries; \
-		  $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/libraries; \
-		fi; \
-	done
-	@for i in $(filter html chm HxS,$(XMLDocWays)); do \
-		if [ $$i != "html" ]; then \
-			$(INSTALL_DIR) $(datadir)/doc; \
-			echo $(INSTALL_DATA) $(INSTALL_OPTS) libraries`echo .$$i | sed s/\.html-no-chunks/.html/` $(datadir)/doc; \
-			$(INSTALL_DATA) $(INSTALL_OPTS) libraries`echo .$$i | sed s/\.html-no-chunks/.html/` $(datadir)/doc; \
-		fi; \
-		if [ $$i = "html-no-chunks" ]; then \
-			echo $(CP) $(FPTOOLS_CSS_ABS) $(datadir); \
-			$(CP) $(FPTOOLS_CSS_ABS) $(datadir); \
-		fi \
-	done
-endif # NO_HADDOCK_DOCS
+
+.PHONY: install install-docs install.library.%
+
+ROOT=$(prefix)/share/ghc/doc/html/
+
+install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR))
+ifeq "$(HADDOCK_DOCS)" "YES"
+	$(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 $(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
+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),install.library.$(SUBDIR)): \
+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))
+	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)/$*
+	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 {} \;
+