X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=a2729dcaf9ec2eb0f2307c447d1a50f3ca29614d;hb=0069a47ad1a539c894f66163cf30c7d98dc9b016;hp=d759d8bb0458492531f468e703e8b790d6104ca1;hpb=979761bcf53bdb03e95e82e0463676ba80cdc0ce;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index d759d8b..a2729dc 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.
@@ -232,14 +232,12 @@ ALL_CONFIGURE_FLAGS = \
 	           $(CONFIGURE_OPTS)
 
 stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).dph/dph-par: \
-    create_dph-par
+    dph/dph-par
 
 stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).dph/dph-seq: \
-    create_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,7 +287,10 @@ 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
@@ -297,7 +298,7 @@ ifneq "$(HSCOLOUR)" ""
 CABAL_HADDOCK_FLAGS=--hyperlink-source
 endif
 
-$(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 \
@@ -386,6 +387,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