X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.nhc98;h=051d631f51084de59fb5f3059cdcd34bc32c440b;hb=3bc3ca5f59c6eaa50926d4c68008359641c3a3e2;hp=ef8229001f4c8ca33d6d1a2367c2460d5984b761;hpb=657be67cb4e96d18aebddbeb0dba54bcf0958ebf;p=ghc-base.git

diff --git a/Makefile.nhc98 b/Makefile.nhc98
index ef82290..051d631 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 \
@@ -11,6 +11,7 @@ SRCS	= \
 	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 Data/FunctorM.hs \
+	Data/Eq.hs Data/Ord.hs \
 	Control/Monad.hs Control/Monad/Fix.hs \
 	Control/Arrow.hs Debug/Trace.hs \
 	NHC/SizedTypes.hs \
@@ -45,89 +46,14 @@ SRCS	= \
 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
+extracfiles:
+	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/Directory.$O: $(OBJDIR)/System/Directory/Internals.$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
-Data/Set.$C:       Data/Monoid.$C Data/List.$C Data/Typeable.$C
-Data/Array.$C:     Data/Ix.$C Data/Typeable.$C
-Data/Dynamic.$C:   Data/HashTable.$C Data/Typeable.$C
-Data/Typeable.$C:  Data/Maybe.$C Data/Either.$C Data/Int.$C Data/Word.$C \
-		   Data/List.$C Data/HashTable.$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/Typeable.$C
-Data/IntMap.$C:    Data/Monoid.$C Data/Bits.$C Data/Int.$C Data/IntSet.$C \
-		   Data/Typeable.$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
-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
-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
-Foreign/Marshal/Array.$C:  Control/Monad.$C Foreign/Ptr.$C Foreign/Storable.$C \
-			   Foreign/Marshal/Alloc.$C Foreign/Marshal/Utils.$C
-Foreign/Marshal/Utils.$C:  Data/Maybe.$C Foreign/Ptr.$C Foreign/Storable.$C \
-			   Foreign/C/Types.$C Foreign/Marshal/Alloc.$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
-Foreign/C.$C:      Foreign/C/Types.$C Foreign/C/Error.$C Foreign/C/String.$C
-Text/Regex.$C:     Text/Regex/Posix.$C
+