summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2007-04-10 22:03:06 +0000
committerIan Lynagh <igloo@earth.li>2007-04-10 22:03:06 +0000
commit8ca46317605d42e01562308dbd32dadea6bb780f (patch)
tree682ab572700429d66b476f070449b4ca8b9f0db2 /libraries
parent03ffa2bfa6c31dc6bcdcacecc2bdb3bbabd800a9 (diff)
downloadhaskell-8ca46317605d42e01562308dbd32dadea6bb780f.tar.gz
parsec, regex-base, regex-compat, regex-posix are no longer core-packages
Diffstat (limited to 'libraries')
-rw-r--r--libraries/Makefile7
-rw-r--r--libraries/core-packages4
-rw-r--r--libraries/extra-packages4
3 files changed, 9 insertions, 6 deletions
diff --git a/libraries/Makefile b/libraries/Makefile
index e0ecc624d9..881cfc2c2c 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -12,8 +12,7 @@ TOP=.
include $(TOP)/mk/boilerplate.mk
endif
-SUBDIRS = base filepath haskell98 template-haskell readline \
- regex-base regex-posix regex-compat parsec Cabal
+SUBDIRS = base filepath haskell98 template-haskell readline Cabal
ifeq "$(GhcLibsWithUnix)" "YES"
SUBDIRS += unix
@@ -25,6 +24,10 @@ endif
# Set GhcBootLibs=YES from the command line to work with just the libraries
# needed to bootstrap GHC.
ifneq "$(GhcBootLibs)" "YES"
+SUBDIRS += $(wildcard regex-base)
+SUBDIRS += $(wildcard regex-posix)
+SUBDIRS += $(wildcard regex-compat)
+SUBDIRS += $(wildcard parsec)
SUBDIRS += $(wildcard haskell-src)
SUBDIRS += $(wildcard html)
SUBDIRS += $(wildcard network)
diff --git a/libraries/core-packages b/libraries/core-packages
index c713985dbf..c1b6adffab 100644
--- a/libraries/core-packages
+++ b/libraries/core-packages
@@ -3,10 +3,6 @@ Cabal
filepath
haskell98
readline
-regex-base
-regex-compat
-regex-posix
-parsec
stm
template-haskell
unix
diff --git a/libraries/extra-packages b/libraries/extra-packages
index fda24ec1c0..75f14cf853 100644
--- a/libraries/extra-packages
+++ b/libraries/extra-packages
@@ -14,5 +14,9 @@ haskell-src
html
mtl
network
+parsec
+regex-base
+regex-compat
+regex-posix
time
xhtml