X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.nhc98;h=0073159d20eb8cea614ea51df926d956e3eeabe0;hb=83819904a18aa04e78ad1476a1640cce8388f470;hp=d9575d3a3cf001d7b4dfac8391285bb5eb24cf49;hpb=09db502afc01e4a267fc070fd339ab6c35e34e7c;p=ghc-base.git

diff --git a/Makefile.nhc98 b/Makefile.nhc98
index d9575d3..0073159 100644
--- a/Makefile.nhc98
+++ b/Makefile.nhc98
@@ -1,27 +1,28 @@
 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
+DIRS	= $(shell ${LOCAL}pkgdirlist ${THISPKG})
 
 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/Ratio.hs Data/Set.hs Data/Tuple.hs Data/Word.hs Data/Array.hs \
-	Data/Dynamic.hs \
+	Data/HashTable.hs Data/Typeable.hs Data/Dynamic.hs \
+	Data/Monoid.hs Data/Tree.hs \
 	Control/Monad.hs Control/Monad/Fix.hs Control/Monad/Trans.hs \
 	Control/Arrow.hs Debug/Trace.hs \
+	NHC/SizedTypes.hs \
 	System/IO.hs System/IO/Error.hs System/IO/Unsafe.hs \
 	System/Environment.hs System/Exit.hs System/Locale.hs \
 	System/Directory.hs System/Mem.hs System/Cmd.hs System/Info.hs \
-	System/Console/GetOpt.hs \
+	System/Console/GetOpt.hs System/Random.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/Error.hs Foreign/C.hs \
+	Foreign/Marshal/Pool.hs Foreign/Marshal.hs \
+	Foreign/C/String.hs Foreign/C/Error.hs Foreign/C.hs Foreign.hs \
 	Text/ParserCombinators/Parsec/Char.hs \
 	Text/ParserCombinators/Parsec/Combinator.hs \
 	Text/ParserCombinators/Parsec/Error.hs \
@@ -31,31 +32,39 @@ SRCS	= \
 	Text/ParserCombinators/Parsec/Prim.hs \
 	Text/ParserCombinators/Parsec.hs \
 	Text/PrettyPrint/HughesPJ.hs Text/PrettyPrint.hs \
-	Text/Html/BlockTable.hs Text/Html.hs
+	Text/Html/BlockTable.hs Text/Html.hs \
+	Text/Read.hs Text/Show.hs Text/Show/Functions.hs
 
-
-#	Data/Dynamic.hs Data/Generics.hs Data/STRef.hs Data/Unique.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/CPUTime.hsc 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/ParserCombinators/ReadP.hs Text/ParserCombinators/ReadPrec.hs
+#	Text/Read/Lex.hs
 #	Text/Regex/* Text/Regex.hs
 
 
 # Here are the main rules.
 include ../Makefile.common
 
+# some extra rules
+NHC/SizedTypes.hs: NHC/SizedTypes.hs.cpp
+	$(CC) -E $< >$@
 
 # 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/Array.$O: $(OBJDIR)/Data/Ix.$O
-$(OBJDIR)/Data/Dynamic.$O: $(OBJDIR)/Foreign/Ptr.$O \
-	$(OBJDIR)/Foreign/StablePtr.$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)/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 \
 	$(OBJDIR)/System/IO/Unsafe.$O
@@ -100,7 +109,11 @@ $(OBJDIR)/Text/ParserCombinators/Parsec/Token.$O: \
 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
+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
+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
 Debug/Trace.$C:    System/IO.$C System/IO/Unsafe.$C
@@ -116,3 +129,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
+