X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=026fe4537ea429deb4806b9ee759110423b3cd7b;hp=a27d92b79e8fafe55fac5fe1cc45039c0f6e8ac3;hb=cc4e58b669ea557909bde4307b0cc5fed19de919;hpb=8c56903f4884d9597e04868e1a67513e63dc89c0

diff --git a/libraries/Makefile b/libraries/Makefile
index a27d92b..026fe45 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -5,43 +5,47 @@ include $(TOP)/mk/boilerplate.mk
 
 # -----------------------------------------------------------------------------
 
-SUBDIRS = base haskell98 template-haskell
+# The Cabal package has a GNUmakefile for standalone building, but we
+# want the Makefile.
+MFLAGS += -f Makefile
+
+SUBDIRS = base haskell98 template-haskell readline regex-base regex-posix regex-compat
 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
 endif
+ifeq "$(Windows)" "YES"
+SUBDIRS += $(wildcard Win32)
+endif
 
 SUBDIRS += Cabal
-SUBDIRS += $(wildcard parsec)
 
 # Set GhcBootLibs=YES from the command line to work with just the libraries
 # needed to bootstrap GHC.
 ifneq "$(GhcBootLibs)" "YES"
+SUBDIRS += $(wildcard parsec)
 SUBDIRS += $(wildcard haskell-src)
+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)
 SUBDIRS += $(wildcard HGL)
 SUBDIRS += $(wildcard OpenGL)
 SUBDIRS += $(wildcard GLUT)
 SUBDIRS += $(wildcard OpenAL)
 SUBDIRS += $(wildcard ALUT)
 SUBDIRS += $(wildcard stm)
+SUBDIRS += $(wildcard xhtml)
+SUBDIRS += $(wildcard cgi)
 ifeq "$(GhcLibsWithObjectIO)" "YES"
 SUBDIRS += $(wildcard ObjectIO)
 endif
 endif
 
-ifeq "$(GhcLibsWithReadline)" "YES"
-SUBDIRS += $(wildcard readline)
-endif
-
 # -----------------------------------------------------------------------------
 
 DIST_CLEAN_FILES += config.cache config.status
@@ -53,7 +57,7 @@ include $(TOP)/mk/target.mk
 
 ifneq "$(NO_HADDOCK_DOCS)" "YES"
 
-HTML_DIR = html
+HTML_DIR = html-docs
 
 # ATTENTION, incomprehensible shell stuff ahead: Automagically create the
 # prologue for the combined index via a header, the package prologues (in