divide packages into "core" and "extra" packages

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index 6c3e6c6..026fe45 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -9,11 +9,14 @@ 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
 endif
+ifeq "$(Windows)" "YES"
+SUBDIRS += $(wildcard Win32)
+endif
 
 SUBDIRS += Cabal
 
@@ -22,15 +25,13 @@ 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)
-ifeq "$(Windows)" "YES"
-SUBDIRS += $(wildcard Win32)
-endif
 SUBDIRS += $(wildcard time)
 SUBDIRS += $(wildcard HGL)
 SUBDIRS += $(wildcard OpenGL)
@@ -38,15 +39,13 @@ 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
@@ -58,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