X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=libraries%2FMakefile;h=db51a679b6ddc9d45e98282f046e26994d90482c;hb=61213f56c7dd51ca3d5175c9e0e9fb946ba19108;hp=efef852eb19987c4054d2d149e61af51748a3896;hpb=674100eccdd01014d165eb74b4193438404e2d40;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index efef852..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,12 +19,9 @@ 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)
@@ -33,7 +31,11 @@ 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)
@@ -59,6 +61,9 @@ ifneq "$(NO_HADDOCK_DOCS)" "YES"
 
 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
 # alphabetical order of the packages) and a footer. Not very nice, but much