From: malcolm <unknown>
Date: Wed, 5 Mar 2003 15:53:10 +0000 (+0000)
Subject: [project @ 2003-03-05 15:53:10 by malcolm]
X-Git-Tag: nhc98-1-18-release~723
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;ds=sidebyside;h=7bab5eb4d4544736c6271c5b9763cb0d7b95b219;p=ghc-base.git

[project @ 2003-03-05 15:53:10 by malcolm]
Build the hierarchical libraries from .hc files when building nhc98 from .hc's.
---

diff --git a/Makefile.nhc98 b/Makefile.nhc98
index cfca3fd..d3e39c8 100644
--- a/Makefile.nhc98
+++ b/Makefile.nhc98
@@ -1,10 +1,7 @@
 THISPKG	= base
 SEARCH	= -I$(TOPDIR)/targets/$(MACHINE)
 
-DIRS	= Data Control Control/Monad Debug System System/IO System/Console \
-	  Foreign Foreign/C Foreign/Marshal Text Text/ParserCombinators \
-	  Text/ParserCombinators/Parsec Text/PrettyPrint Text/Html \
-	  Text/Show
+DIRS	= $(shell ${LOCAL}pkgdirlist ${THISPKG})
 
 SRCS	= \
 	Data/Bits.hs Data/Bool.hs Data/Char.hs Data/Complex.hs \
@@ -119,3 +116,24 @@ Foreign/Marshal/Utils.$C:  Data/Maybe.$C Foreign/Ptr.$C Foreign/Storable.$C \
 Foreign/Marshal/Error.$C:  Foreign/Ptr.$C
 Foreign/C/String.$C:       Data/Word.$C Foreign/Ptr.$C Foreign/C/Types.$C \
 	Foreign/Marshal/Array.$C
+Text/ParserCombinators/Parsec/Char.$C: \
+	Text/ParserCombinators/Parsec/Pos.$C \
+	Text/ParserCombinators/Parsec/Prim.$C
+Text/ParserCombinators/Parsec/Combinator.$C: \
+	Text/ParserCombinators/Parsec/Prim.$C
+Text/ParserCombinators/Parsec/Error.$C: \
+	Text/ParserCombinators/Parsec/Pos.$C
+Text/ParserCombinators/Parsec/Expr.$C: \
+	Text/ParserCombinators/Parsec/Prim.$C \
+	Text/ParserCombinators/Parsec/Combinator.$C
+Text/ParserCombinators/Parsec/Language.$C: \
+	Text/ParserCombinators/Parsec.$C \
+	Text/ParserCombinators/Parsec/Token.$C
+Text/ParserCombinators/Parsec/Perm.$C: \
+	Text/ParserCombinators/Parsec.$C
+Text/ParserCombinators/Parsec/Prim.$C: \
+	Text/ParserCombinators/Parsec/Pos.$C \
+	Text/ParserCombinators/Parsec/Error.$C
+Text/ParserCombinators/Parsec/Token.$C: \
+	Text/ParserCombinators/Parsec.$C
+