From: malcolm <unknown>
Date: Fri, 14 Jan 2005 14:31:58 +0000 (+0000)
Subject: [project @ 2005-01-14 14:31:58 by malcolm]
X-Git-Tag: nhc98-1-18-release~109
X-Git-Url: http://git.megacz.com/?p=ghc-base.git;a=commitdiff_plain;h=65c23237b8e85a2caef9956b267bbe18ac7679df

[project @ 2005-01-14 14:31:58 by malcolm]
Hook up the new Text.Map, Text.IntSet, and Text.IntMap modules, and
the existing Text.Regex stuff.
---

diff --git a/Makefile.nhc98 b/Makefile.nhc98
index 217231d..bced8dc 100644
--- a/Makefile.nhc98
+++ b/Makefile.nhc98
@@ -10,6 +10,7 @@ SRCS	= \
 	Data/Ratio.hs Data/Set.hs Data/Tuple.hs Data/Word.hs Data/Array.hs \
 	Data/HashTable.hs Data/Typeable.hs Data/Dynamic.hs \
 	Data/Monoid.hs Data/Queue.hs Data/Tree.hs \
+	Data/Map.hs Data/IntMap.hs Data/IntSet.hs \
 	Control/Monad.hs Control/Monad/Fix.hs \
 	Control/Arrow.hs Debug/Trace.hs \
 	NHC/SizedTypes.hs \
@@ -28,7 +29,8 @@ SRCS	= \
 	Text/PrettyPrint/HughesPJ.hs Text/PrettyPrint.hs \
 	Text/Html/BlockTable.hs Text/Html.hs Text/Printf.hs \
 	Text/Read.hs Text/Show.hs Text/Show/Functions.hs \
-	Text/ParserCombinators/ReadP.hs Data/Version.hs
+	Text/ParserCombinators/ReadP.hs Data/Version.hs \
+	Text/Regex/Posix.hsc Text/Regex.hs
 
 
 #	Text/ParserCombinators/ReadPrec.hs
@@ -36,7 +38,6 @@ SRCS	= \
 #	System/Mem.hs System/Mem/StableName.hs System/Mem/Weak.hs
 #	System/Posix/Types.hs System/Posix/Signals.hsc
 #	Text/Read/Lex.hs
-#	Text/Regex/* Text/Regex.hs
 
 
 # Here are the main rules.
@@ -48,13 +49,17 @@ NHC/SizedTypes.hs: NHC/SizedTypes.hs.cpp
 
 # Here are the dependencies.
 $(OBJDIR)/Data/FiniteMap.$O: $(OBJDIR)/Data/Maybe.$O
-$(OBJDIR)/Data/Set.$O: $(OBJDIR)/Data/Maybe.$O $(OBJDIR)/Data/FiniteMap.$O
+$(OBJDIR)/Data/Set.$O: $(OBJDIR)/Data/Monoid.$O $(OBJDIR)/Data/List.$O
 $(OBJDIR)/Data/Array.$O: $(OBJDIR)/Data/Ix.$O
 $(OBJDIR)/Data/Dynamic.$O: $(OBJDIR)/Data/HashTable.$O \
 	$(OBJDIR)/Data/Typeable.$O
 $(OBJDIR)/Data/HashTable.$O: $(OBJDIR)/Control/Monad.$O
 $(OBJDIR)/Data/Int.$O: $(OBJDIR)/NHC/SizedTypes.$O
 $(OBJDIR)/Data/Word.$O: $(OBJDIR)/NHC/SizedTypes.$O
+$(OBJDIR)/Data/Tree.$O: $(OBJDIR)/Control/Monad.$O $(OBJDIR)/Data/Maybe.$O $(OBJDIR)/Data/Queue.$O
+$(OBJDIR)/Data/Map.$O: $(OBJDIR)/Data/Monoid.$O $(OBJDIR)/Data/Set.$O $(OBJDIR)/Data/List.$O
+$(OBJDIR)/Data/IntMap.$O: $(OBJDIR)/Data/Monoid.$O $(OBJDIR)/Data/Bits.$O $(OBJDIR)/Data/Int.$O $(OBJDIR)/Data/IntSet.$O
+$(OBJDIR)/Data/IntSet.$O: $(OBJDIR)/Data/Monoid.$O $(OBJDIR)/Data/Bits.$O $(OBJDIR)/Data/Int.$O $(OBJDIR)/Data/List.$O
 $(OBJDIR)/NHC/SizedTypes.$O: $(OBJDIR)/Data/Bits.$O
 $(OBJDIR)/System/IO.$O: $(OBJDIR)/System/IO/Error.$O
 $(OBJDIR)/System/Random.$O: $(OBJDIR)/Data/Char.$O $(OBJDIR)/Data/IORef.$O \
@@ -75,15 +80,20 @@ $(OBJDIR)/Foreign/C/String.$O: $(OBJDIR)/Data/Word.$O $(OBJDIR)/Foreign/Ptr.$O \
 	$(OBJDIR)/Foreign/Marshal/Array.$O $(OBJDIR)/Foreign/C/Types.$O 
 $(OBJDIR)/Foreign/C.$O: $(OBJDIR)/Foreign/C/Types.$O \
 	$(OBJDIR)/Foreign/C/Error.$O $(OBJDIR)/Foreign/C/String.$O
+$(OBJDIR)/Text/Regex.$O: $(OBJDIR)/Text/Regex/Posix.$O
 
 # C-files dependencies.
 Data/FiniteMap.$C: Data/Maybe.$C
-Data/Set.$C:       Data/Maybe.$C Data/FiniteMap.$C
+Data/Set.$C:       Data/Monoid.$C Data/List.$C
 Data/Array.$C:     Data/Ix.$C
 Data/Dynamic.$C:   Data/HashTable.$C Data/Typeable.$C
 Data/HashTable.$C: Control/Monad.$C
 Data/Int.$C:       NHC/SizedTypes.$C
 Data/Word.$C:      NHC/SizedTypes.$C
+Data/Tree.$C:      Control/Monad.$C Data/Maybe.$C Data/Queue.$C
+Data/Map.$C:       Data/Monoid.$C Data/Set.$C Data/List.$C
+Data/IntMap.$C:    Data/Monoid.$C Data/Bits.$C Data/Int.$C Data/IntSet.$C
+Data/IntSet.$C:    Data/Monoid.$C Data/Bits.$C Data/Int.$C Data/List.$C
 NHC/SizedTypes.$C: Data/Bits.$C
 System/IO.$C:      System/IO/Error.$C
 System/Random.$C:  Data/Char.$C Data/IORef.$C System/IO/Unsafe.$C
@@ -99,4 +109,4 @@ 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
 Foreign/C.$C:      Foreign/C/Types.$C Foreign/C/Error.$C Foreign/C/String.$C
-
+Text/Regex.$C:     Text/Regex/Posix.$C