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

diff --git a/libraries/Makefile b/libraries/Makefile
index f64293c..026fe45 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -9,7 +9,7 @@ include $(TOP)/mk/boilerplate.mk
 # want the Makefile.
 MFLAGS += -f Makefile
 
-SUBDIRS = base haskell98 template-haskell
+SUBDIRS = base haskell98 template-haskell readline regex-base regex-posix regex-compat
 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
@@ -25,30 +25,27 @@ SUBDIRS += Cabal
 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)
-ifneq "$(Windows)" "YES"
 SUBDIRS += $(wildcard time)
-endif
 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
@@ -60,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