X-Git-Url: http://git.megacz.com/?p=ghc-base.git;a=blobdiff_plain;f=Makefile.nhc98;h=25fb832e377b7c43ab1ebba6b26f2b10323b2492;hp=2b21277d200ab65e93d1ba4e7b47c06cc1b3353b;hb=be2750a0a11b919fb03cc070074e430f88bdfa90;hpb=975a9da7e46881555ff49841e8a88babe50a2119

diff --git a/Makefile.nhc98 b/Makefile.nhc98
index 2b21277..25fb832 100644
--- a/Makefile.nhc98
+++ b/Makefile.nhc98
@@ -1,50 +1,68 @@
 THISPKG	= base
-SEARCH	= -I$(TOPDIR)/targets/$(MACHINE) -Iinclude
-EXTRA_H_FLAGS   = -H4M -K3M
+SEARCH	= -I$(TOPDIR)/targets/$(MACHINE) -Iinclude \
+	  -I../../prelude/PreludeIO -I../../prelude/`$(LOCAL)harch`
+EXTRA_H_FLAGS   = -H4M -K6M
+EXTRA_C_FLAGS   = -D__NHC__
 EXTRA_HBC_FLAGS = -H16M -A1M
 
+DIRS	= \
+	Data Debug Control Control/Monad System System/IO System/Console \
+	Text Text/Html Text/Show Text/ParserCombinators Text/Regex \
+	Foreign Foreign/Marshal Foreign/C NHC Unsafe System/Posix \
+	Control/Exception GHC GHC/IO
+
 SRCS	= \
 	Data/Bits.hs Data/Bool.hs Data/Char.hs Data/Complex.hs \
 	Data/Either.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/Ix.hs Data/List.hs Data/Maybe.hs \
+	Data/Ratio.hs Data/Tuple.hs Data/Word.hs \
 	Data/HashTable.hs Data/Typeable.hs Data/Dynamic.hs \
-	Data/Monoid.hs Data/Tree.hs \
-	Data/Map.hs Data/IntMap.hs Data/IntSet.hs \
-	Data/Eq.hs Data/Ord.hs \
-	Data/Foldable.hs Data/Traversable.hs Data/Sequence.hs \
-	Data/Function.hs Data/Graph.hs \
+	Data/Monoid.hs Data/String.hs \
+	Data/Eq.hs Data/Ord.hs Data/Fixed.hs \
+	Data/Functor.hs Data/Foldable.hs Data/Traversable.hs \
+	Data/Function.hs \
 	Control/Monad.hs Control/Monad/Fix.hs Control/Monad/Instances.hs \
 	Control/Arrow.hs Control/Applicative.hs \
+	Control/Exception.hs Control/Exception/Base.hs Control/Category.hs \
 	Debug/Trace.hs \
-	NHC/SizedTypes.hs \
+	NHC/SizedTypes.hs NHC/PosixTypes.hsc \
 	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/Random.hs \
-	System/CPUTime.hsc System/Time.hsc \
-	System/Directory/Internals.hs \
+	System/Environment.hs System/Exit.hs \
+	System/Mem.hs System/Info.hs \
+	System/CPUTime.hsc \
 	Foreign/Ptr.hs Foreign/StablePtr.hs Foreign/Storable.hs \
 	Foreign/ForeignPtr.hs Foreign/C/Types.hs \
 	Foreign/Marshal/Alloc.hs Foreign/Marshal/Array.hs \
 	Foreign/Marshal/Utils.hs Foreign/Marshal/Error.hs \
 	Foreign/Marshal/Pool.hs Foreign/Marshal.hs \
 	Foreign/C/String.hs Foreign/C/Error.hs Foreign/C.hs Foreign.hs \
-	Text/PrettyPrint/HughesPJ.hs Text/PrettyPrint.hs \
 	Text/Printf.hs \
 	Text/Read.hs Text/Show.hs Text/Show/Functions.hs \
 	Text/ParserCombinators/ReadP.hs Data/Version.hs \
 	Unsafe/Coerce.hs \
-	WCsubst.c
+	WCsubst.c \
+	GHC/IO/Device.hs \
+	System/Posix/Types.hs System/Posix/Internals.hs \
+	System/Console/GetOpt.hs \
+
+#	Data/String.hs
+#	Text/ParserCombinators/ReadPrec.hs
+#	Text/Read/Lex.hs
 
+# now moved to separate packages:
+#	System/Directory.hs \
+#	System/Directory/Internals.hs \
+#	Text/PrettyPrint/HughesPJ.hs Text/PrettyPrint.hs \
+#	System/Random.hs System/Locale.hs System/Time.hsc \
+#	System/Cmd.hs \
+#	System/Timeout.hs \
 
 #	Text/Regex/Posix.hsc Text/Regex.hs \
-#	Text/ParserCombinators/ReadPrec.hs
 #	[Data/Dynamic.hs] Data/Generics.hs Data/STRef.hs Data/Unique.hs
 #	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
+#	dirUtils.c
 
 
 # Here are the main rules.
@@ -54,9 +72,13 @@ include ../Makefile.common
 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
+	$(INSTALL) include/Typeable.h $(INCDIR)/packages/$(THISPKG)
+	$(INSTALL) include/Nhc98BaseConfig.h $(INCDIR)/packages/$(THISPKG)
 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
+	$(INSTALL) include/Typeable.h $(INCDIR)/packages/$(THISPKG)
+	$(INSTALL) include/Nhc98BaseConfig.h $(INCDIR)/packages/$(THISPKG)
 
 # Here are any extra dependencies.