[project @ 2002-12-18 10:34:28 by malcolm]

Add a bunch more libraries to the nhc98 build.

diff --git a/Makefile.nhc98 b/Makefile.nhc98
index dd3e5da..d9575d3 100644 (file)
--- a/Makefile.nhc98
+++ b/Makefile.nhc98
@@ -1,29 +1,49 @@
 THISPKG        = base
-SEARCH =
+SEARCH = -I$(TOPDIR)/targets/$(MACHINE)
 
-DIRS   = Data Control Control/Monad Debug System System/IO \
-         Foreign Foreign/C Foreign/Marshal
+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
 
 SRCS   = \
        Data/Bits.hs Data/Bool.hs Data/Char.hs Data/Complex.hs \
        Data/Either.hs Data/FiniteMap.hs Data/IORef.hs Data/Int.hs \
        Data/Ix.hs Data/List.hs Data/Maybe.hs Data/PackedString.hs \
-       Data/Set.hs Data/Tuple.hs Data/Word.hs Data/Array.hs \
-       Control/Monad.hs Control/Monad/Fix.hs Control/Monad/Identity.hs \
-       Control/Monad/Trans.hs \
-       Debug/Trace.hs \
+       Data/Ratio.hs Data/Set.hs Data/Tuple.hs Data/Word.hs Data/Array.hs \
+       Data/Dynamic.hs \
+       Control/Monad.hs Control/Monad/Fix.hs Control/Monad/Trans.hs \
+       Control/Arrow.hs Debug/Trace.hs \
        System/IO.hs System/IO/Error.hs System/IO/Unsafe.hs \
        System/Environment.hs System/Exit.hs System/Locale.hs \
-       System/Mem.hs System/Cmd.hs \
+       System/Directory.hs System/Mem.hs System/Cmd.hs System/Info.hs \
+       System/Console/GetOpt.hs \
        Foreign/Ptr.hs Foreign/StablePtr.hs Foreign/Storable.hs \
        Foreign/ForeignPtr.hs Foreign/C/Types.hs Foreign/C/TypesISO.hs \
        Foreign/Marshal/Alloc.hs Foreign/Marshal/Array.hs \
        Foreign/Marshal/Utils.hs Foreign/Marshal/Error.hs \
-       Foreign/C/String.hs
+       Foreign/C/String.hs Foreign/C/Error.hs Foreign/C.hs \
+       Text/ParserCombinators/Parsec/Char.hs \
+       Text/ParserCombinators/Parsec/Combinator.hs \
+       Text/ParserCombinators/Parsec/Error.hs \
+       Text/ParserCombinators/Parsec/Expr.hs \
+       Text/ParserCombinators/Parsec/Perm.hs \
+       Text/ParserCombinators/Parsec/Pos.hs \
+       Text/ParserCombinators/Parsec/Prim.hs \
+       Text/ParserCombinators/Parsec.hs \
+       Text/PrettyPrint/HughesPJ.hs Text/PrettyPrint.hs \
+       Text/Html/BlockTable.hs Text/Html.hs
 
-#      Data/Ratio.hs
-#      System/Random.hs
+
+#      Data/Dynamic.hs Data/Generics.hs Data/STRef.hs Data/Unique.hs
+#      Control/Monad/Identity.hs
 #      Debug/QuickCheck.hs
+#      System/CPUTime.hsc System/Random.hs System/Time.hsc
+#      System/Mem.hs System/Mem/StableName.hs System/Mem/Weak.hs
+#      System/Posix/Types.hs System/Posix/Signals.hsc
+#      Text/ParserCombinators/Parsec/Token.hs \
+#      Text/ParserCombinators/Parsec/Language.hs \
+#      Text/Read/* Text/Read.hs Text/Show/* Text/Show.hs
+#      Text/Regex/* Text/Regex.hs
 
 
 # Here are the main rules.
@@ -34,6 +54,8 @@ include ../Makefile.common
 $(OBJDIR)/Data/FiniteMap.$O: $(OBJDIR)/Data/Maybe.$O
 $(OBJDIR)/Data/Set.$O: $(OBJDIR)/Data/Maybe.$O $(OBJDIR)/Data/FiniteMap.$O
 $(OBJDIR)/Data/Array.$O: $(OBJDIR)/Data/Ix.$O
+$(OBJDIR)/Data/Dynamic.$O: $(OBJDIR)/Foreign/Ptr.$O \
+       $(OBJDIR)/Foreign/StablePtr.$O
 $(OBJDIR)/System/IO.$O: $(OBJDIR)/System/IO/Error.$O
 $(OBJDIR)/System/Random.$O: $(OBJDIR)/Data/Char.$O $(OBJDIR)/Data/IORef.$O \
        $(OBJDIR)/System/IO/Unsafe.$O
@@ -53,11 +75,32 @@ $(OBJDIR)/Foreign/Marshal/Utils.$O:  $(OBJDIR)/Data/Maybe.$O \
 $(OBJDIR)/Foreign/Marshal/Error.$O: $(OBJDIR)/Foreign/Ptr.$O
 $(OBJDIR)/Foreign/C/String.$O: $(OBJDIR)/Data/Word.$O $(OBJDIR)/Foreign/Ptr.$O \
        $(OBJDIR)/Foreign/Marshal/Array.$O $(OBJDIR)/Foreign/C/Types.$O 
+$(OBJDIR)/Text/ParserCombinators/Parsec/Char.$O: \
+       $(OBJDIR)/Text/ParserCombinators/Parsec/Pos.$O \
+       $(OBJDIR)/Text/ParserCombinators/Parsec/Prim.$O
+$(OBJDIR)/Text/ParserCombinators/Parsec/Combinator.$O: \
+       $(OBJDIR)/Text/ParserCombinators/Parsec/Prim.$O
+$(OBJDIR)/Text/ParserCombinators/Parsec/Error.$O: \
+       $(OBJDIR)/Text/ParserCombinators/Parsec/Pos.$O
+$(OBJDIR)/Text/ParserCombinators/Parsec/Expr.$O: \
+       $(OBJDIR)/Text/ParserCombinators/Parsec/Prim.$O \
+       $(OBJDIR)/Text/ParserCombinators/Parsec/Combinator.$O
+$(OBJDIR)/Text/ParserCombinators/Parsec/Language.$O: \
+       $(OBJDIR)/Text/ParserCombinators/Parsec.$O \
+       $(OBJDIR)/Text/ParserCombinators/Parsec/Token.$O
+$(OBJDIR)/Text/ParserCombinators/Parsec/Perm.$O: \
+       $(OBJDIR)/Text/ParserCombinators/Parsec.$O
+$(OBJDIR)/Text/ParserCombinators/Parsec/Prim.$O: \
+       $(OBJDIR)/Text/ParserCombinators/Parsec/Pos.$O \
+       $(OBJDIR)/Text/ParserCombinators/Parsec/Error.$O
+$(OBJDIR)/Text/ParserCombinators/Parsec/Token.$O: \
+       $(OBJDIR)/Text/ParserCombinators/Parsec.$O
 
 # C-files dependencies.
 Data/FiniteMap.$C: Data/Maybe.$C
 Data/Set.$C:       Data/Maybe.$C Data/FiniteMap.$C
 Data/Array.$C:     Data/Ix.$C
+Data/Dynamic.$C:   Foreign/Ptr.$C
 System/IO.$C:      System/IO/Error.$C
 System/Random.$C:  Data/Char.$C Data/IORef.$C System/IO/Unsafe.$C
 Debug/Trace.$C:    System/IO.$C System/IO/Unsafe.$C