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

diff --git a/libraries/Makefile b/libraries/Makefile
index b4b9ee1..2d68868 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 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
 
@@ -231,15 +231,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,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 \