X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=4249ceec49935ddf6acc4d897ebcbad1a3dea417;hp=b4b9ee13581ee2cad9c04a39a908dfd25767e5cb;hb=ecb13508a1c09df7b87ba5260a30a2a23bdd46d0;hpb=11dd589e8623e5e17a7446cfa649a1bf7d61c0e6

diff --git a/libraries/Makefile b/libraries/Makefile
index b4b9ee1..4249cee 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -41,15 +41,15 @@ include $(TOP)/mk/cabal-flags.mk
 
 # Any libraries listed here should also be in ../packages
 
-SUBDIRS  = ghc-prim $(INTEGER_LIBRARY) base array packedstring
-SUBDIRS += containers bytestring old-locale old-time filepath directory
+SUBDIRS  = ghc-prim $(INTEGER_LIBRARY) base syb concurrent unique timeout st getopt base3-compat array packedstring
+SUBDIRS += containers bytestring old-locale old-time filepath 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
 endif
 ifeq "$(Windows)" "YES"
 SUBDIRS += $(wildcard Win32)
 endif
-SUBDIRS += process pretty hpc template-haskell editline Cabal random haskell98
+SUBDIRS += directory process pretty hpc template-haskell editline Cabal random haskell98
 
 # Set GhcBootLibs=YES from the command line to work with just the libraries
 # needed to bootstrap GHC.
@@ -73,8 +73,8 @@ SUBDIRS += dph/dph-base
 SUBDIRS += dph/dph-prim-interface
 SUBDIRS += dph/dph-prim-seq
 SUBDIRS += dph/dph-prim-par
-SUBDIRS += dph/dph_seq
-SUBDIRS += dph/dph_par
+SUBDIRS += dph/dph-seq
+SUBDIRS += dph/dph-par
 endif
 endif
 
@@ -164,7 +164,7 @@ BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir
 boot: ifBuildable/ifBuildable cabal-bin bootstrapping.conf
 
 cabal-bin: cabal-bin.hs
-	mkdir bootstrapping
+	-mkdir bootstrapping
 	$(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal-bin -o cabal-bin
 
 bootstrapping.conf: cabal-bin
@@ -197,10 +197,6 @@ endif
 
 all: build
 
-ifeq "$(HADDOCK_DOCS)" "YES"
-all: doc
-endif
-
 .PHONY: rebuild.library.%
 .PHONY: remake.library.%
 
@@ -231,15 +227,13 @@ ALL_CONFIGURE_FLAGS = \
 	                              --use-index=../doc-index.html" \
 	           $(CONFIGURE_OPTS)
 
-stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).dph/dph_par: \
-    create_dph_par
+stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).dph/dph-par: \
+    dph/dph-par
 
-stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).dph/dph_seq: \
-    create_dph_seq
+stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).dph/dph-seq: \
+    dph/dph-seq
 
-.PHONY: dph_create_par create_dph_seq
-
-create_dph_par create_dph_seq: create_%:
+dph/%:
 	$(MAKE) -C dph $*
 
 $(foreach SUBDIR,$(SUBDIRS), \
@@ -289,15 +283,19 @@ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
 
 html: doc
 
-doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
+# No docs for compat libraries for now.
+DOC_SUBDIRS = $(filter-out %-compat, $(SUBDIRS))
+
+doc: $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR))
 	sh gen_contents_index --inplace
 
 # Making hyperlinked source only works if we have hscolour
 ifneq "$(HSCOLOUR)" ""
-CABAL_HADDOCK_FLAGS=--hyperlink-source
+CABAL_HADDOCK_FLAGS += --hyperlink-source
 endif
+CABAL_HADDOCK_FLAGS += --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock
 
-$(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
+$(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                cabal-bin ifBuildable/ifBuildable bootstrapping.conf
 	if $(IFBUILDABLE) $*; then \
@@ -377,7 +375,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
 install.library.%: ifBuildable/ifBuildable
 	if $(IFBUILDABLE) $*; then \
 	  cd $* && \
-	  $(INSTALL_PACKAGE) install '$(DESTDIR)$(bindir)/ghc-pkg' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \
+	  $(INSTALL_PACKAGE) install '$(GHC_PKG_INSTALL_PROG)' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \
 	fi
 
 .PHONY: binary-dist binary-dist.library.%
@@ -386,6 +384,10 @@ BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries
 
 BINDIST_EXTRAS += ifBuildable/ifBuildable
 binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR))
+ifeq "$(WHERE_AM_I)" ""
+	echo "I don't know where I am" >&2
+	exit 1
+endif
 	echo $(WHERE_AM_I)/Makefile >> $(BIN_DIST_LIST)
 # XXX This needs to be changed: This ifBuildable is built with the
 # bootstrapping compiler, so isn't OS X friendly. It should be made into