X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.nhc98;h=b0ba8ea52958f352684d713d62d1a8d5acc666f3;hb=0425e42d530ad34fbef2529a20ba326dbd4109b7;hp=d3d0987136eeffb56574d8c3e2d999bf16f4037d;hpb=1941fabdc91b34dec7d24d7e557b918221fe4c6e;p=ghc-base.git

diff --git a/Makefile.nhc98 b/Makefile.nhc98
index d3d0987..b0ba8ea 100644
--- a/Makefile.nhc98
+++ b/Makefile.nhc98
@@ -1,7 +1,7 @@
 THISPKG	= base
 SEARCH	= -I$(TOPDIR)/targets/$(MACHINE) -Iinclude
-EXTRA_H_FLAGS   = +RTS -H4M -K2M -RTS
-EXTRA_HBC_FLAGS = +RTS -H16M -A1M -RTS
+EXTRA_H_FLAGS   = -H4M -K2M
+EXTRA_HBC_FLAGS = -H16M -A1M
 
 SRCS	= \
 	Data/Bits.hs Data/Bool.hs Data/Char.hs Data/Complex.hs \
@@ -16,10 +16,10 @@ SRCS	= \
 	NHC/SizedTypes.hs \
 	System/IO.hs System/IO/Error.hs System/IO/Unsafe.hs \
 	System/Environment.hs System/Exit.hs System/Locale.hs \
-	System/FilePath.hs \
 	System/Directory.hs System/Mem.hs System/Cmd.hs System/Info.hs \
 	System/Console/GetOpt.hs System/Random.hs \
 	System/CPUTime.hsc System/Time.hsc \
+	System/Directory/Internals.hs \
 	Foreign/Ptr.hs Foreign/StablePtr.hs Foreign/Storable.hs \
 	Foreign/ForeignPtr.hs Foreign/C/Types.hs \
 	Foreign/Marshal/Alloc.hs Foreign/Marshal/Array.hs \
@@ -38,62 +38,18 @@ SRCS	= \
 #	System/Mem.hs System/Mem/StableName.hs System/Mem/Weak.hs
 #	System/Posix/Types.hs System/Posix/Signals.hsc
 #	Text/Read/Lex.hs
+#	System/FilePath.hs
 
 
 # Here are the main rules.
 include ../Makefile.common
 
 # some extra rules
-NHC/SizedTypes.hs: NHC/SizedTypes.hs.cpp
-	$(CC) -E $< >$@
+extra:
+	if [ -f Prelude.hs ]; then mv Prelude.hs Prelude.hs.unused; fi
+	if [ -f Numeric.hs ]; then mv Numeric.hs Numeric.hs.unused; fi
 
-# Here are the dependencies.
-$(OBJDIR)/Data/FiniteMap.$O: $(OBJDIR)/Data/Maybe.$O
-$(OBJDIR)/Data/Set.$O: $(OBJDIR)/Data/Monoid.$O $(OBJDIR)/Data/List.$O \
-	$(OBJDIR)/Data/Typeable.$O
-$(OBJDIR)/Data/Array.$O: $(OBJDIR)/Data/Ix.$O $(OBJDIR)/Data/Typeable.$O
-$(OBJDIR)/Data/Dynamic.$O: $(OBJDIR)/Data/HashTable.$O \
-	$(OBJDIR)/Data/Typeable.$O
-$(OBJDIR)/Data/Typeable.$O: $(OBJDIR)/Data/Maybe.$O $(OBJDIR)/Data/Either.$O
-	$(OBJDIR)/Data/Int.$O $(OBJDIR)/Data/Word.$O $(OBJDIR)/Data/List.$O
-	$(OBJDIR)/Data/HashTable.$O
-$(OBJDIR)/Data/HashTable.$O: $(OBJDIR)/Control/Monad.$O \
-	$(OBJDIR)/Data/Tuple.$O $(OBJDIR)/Data/Bits.$O $(OBJDIR)/Data/List.$O \
-	$(OBJDIR)/Data/Int.$O $(OBJDIR)/Data/Maybe.$O $(OBJDIR)/Data/Char.$O \
-	$(OBJDIR)/Data/IORef.$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/Typeable.$O
-$(OBJDIR)/Data/IntMap.$O: $(OBJDIR)/Data/Monoid.$O $(OBJDIR)/Data/Bits.$O \
-	$(OBJDIR)/Data/Int.$O $(OBJDIR)/Data/IntSet.$O \
-	$(OBJDIR)/Data/Typeable.$O
-$(OBJDIR)/Data/IntSet.$O: $(OBJDIR)/Data/Monoid.$O $(OBJDIR)/Data/Bits.$O \
-	$(OBJDIR)/Data/Int.$O $(OBJDIR)/Data/List.$O $(OBJDIR)/Data/Typeable.$O
-$(OBJDIR)/Data/FunctorM.$O: $(OBJDIR)/Data/Array.$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 $(OBJDIR)/Foreign/Ptr.$O
-$(OBJDIR)/Debug/Trace.$O: $(OBJDIR)/System/IO.$O $(OBJDIR)/System/IO/Unsafe.$O
-$(OBJDIR)/Control/Monad/Fix.$O: $(OBJDIR)/System/IO.$O
-$(OBJDIR)/Foreign/Marshal/Alloc.$O:  $(OBJDIR)/Data/Maybe.$O \
-	$(OBJDIR)/Foreign/Ptr.$O $(OBJDIR)/Foreign/Storable.$O \
-	$(OBJDIR)/Foreign/C/Types.$O
-$(OBJDIR)/Foreign/Marshal/Array.$O:  $(OBJDIR)/Control/Monad.$O \
-	$(OBJDIR)/Foreign/Ptr.$O $(OBJDIR)/Foreign/Storable.$O \
-	$(OBJDIR)/Foreign/Marshal/Alloc.$O $(OBJDIR)/Foreign/Marshal/Utils.$O
-$(OBJDIR)/Foreign/Marshal/Utils.$O:  $(OBJDIR)/Data/Maybe.$O \
-	$(OBJDIR)/Foreign/Ptr.$O $(OBJDIR)/Foreign/Storable.$O \
-	$(OBJDIR)/Foreign/Marshal/Alloc.$O $(OBJDIR)/Foreign/C/Types.$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)/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
+# Here are any extra dependencies.
 
 # C-files dependencies.
 Data/FiniteMap.$C: Data/Maybe.$C
@@ -112,10 +68,14 @@ 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 \
 		   Data/Typeable.$C
 Data/FunctorM.$C:  Data/Array.$C
+Data/Version.$C:   Text/ParserCombinators/ReadP.$C Data/Typeable.$C \
+		   Data/List.$C Data/Char.$C Control/Monad.$C
 NHC/SizedTypes.$C: Data/Bits.$C
 System/IO.$C:      System/IO/Error.$C
+System/Info.$C:    Data/Version.$C
 System/Random.$C:  Data/Char.$C Data/IORef.$C System/IO/Unsafe.$C
 Debug/Trace.$C:    System/IO.$C System/IO/Unsafe.$C
+System/Directory.$C:       System/Directory/Internals.$C
 Control/Monad/Fix.$C:      System/IO.$C
 Foreign/Marshal/Alloc.$C:  Data/Maybe.$C Foreign/Ptr.$C Foreign/Storable.$C \
 			   Foreign/C/Types.$C