X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=db51a679b6ddc9d45e98282f046e26994d90482c;hp=618916e5102b123ff3d8cc65405ff10ea39fa9ea;hb=61213f56c7dd51ca3d5175c9e0e9fb946ba19108;hpb=8df809e4ce2319cccd91b14a74e13c879faaf357

diff --git a/libraries/Makefile b/libraries/Makefile
index 618916e..db51a67 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -9,7 +9,8 @@ include $(TOP)/mk/boilerplate.mk
 # want the Makefile.
 MFLAGS += -f Makefile
 
-SUBDIRS = base haskell98 template-haskell readline
+SUBDIRS = base haskell98 template-haskell readline \
+	  regex-base regex-posix regex-compat parsec Cabal
 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
@@ -18,13 +19,11 @@ ifeq "$(Windows)" "YES"
 SUBDIRS += $(wildcard Win32)
 endif
 
-SUBDIRS += Cabal
-
 # 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)
@@ -32,12 +31,18 @@ SUBDIRS += $(wildcard mtl)
 SUBDIRS += $(wildcard fgl)
 SUBDIRS += $(wildcard X11)
 SUBDIRS += $(wildcard time)
+ifeq "$(Windows)" "NO"
+# HGL is not working on Win32, so omit it for now.  Better not to ship it
+# at all than to ship a broken version.
 SUBDIRS += $(wildcard HGL)
+endif
 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
@@ -54,7 +59,10 @@ include $(TOP)/mk/target.mk
 
 ifneq "$(NO_HADDOCK_DOCS)" "YES"
 
-HTML_DIR = html
+HTML_DIR = html-docs
+
+extraclean ::
+	$(RM) -rf $(HTML_DIR)
 
 # ATTENTION, incomprehensible shell stuff ahead: Automagically create the
 # prologue for the combined index via a header, the package prologues (in