X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.nhc98;h=fe1f0967e3e19cc923a02c902e6e6980206ef9be;hb=224d5f606cd66e19381e6ae32419e916fdf34e6e;hp=74ae9c3332d9bf90773981d267a39c1399164217;hpb=b21d4af465d575d0072ddf97e178e0e9545f77ba;p=ghc-base.git diff --git a/Makefile.nhc98 b/Makefile.nhc98 index 74ae9c3..fe1f096 100644 --- a/Makefile.nhc98 +++ b/Makefile.nhc98 @@ -1,7 +1,7 @@ THISPKG = base -SEARCH = -I$(TOPDIR)/targets/$(MACHINE) - -DIRS = $(shell ${LOCAL}pkgdirlist ${THISPKG}) +SEARCH = -I$(TOPDIR)/targets/$(MACHINE) -Iinclude +EXTRA_H_FLAGS = +RTS -H4M -K2M -RTS +EXTRA_HBC_FLAGS = +RTS -H16M -A1M -RTS SRCS = \ Data/Bits.hs Data/Bool.hs Data/Char.hs Data/Complex.hs \ @@ -9,40 +9,28 @@ SRCS = \ 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/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 \ + Data/Monoid.hs Data/Queue.hs Data/Tree.hs \ + Control/Monad.hs Control/Monad/Fix.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/Random.hs \ + System/CPUTime.hsc System/Time.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/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 \ Text/Read.hs Text/Show.hs Text/Show/Functions.hs # [Data/Dynamic.hs] Data/Generics.hs Data/STRef.hs Data/Unique.hs -# Control/Monad/Identity.hs -# Debug/QuickCheck.hs -# 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/ParserCombinators/ReadP.hs Text/ParserCombinators/ReadPrec.hs # Text/Read/Lex.hs # Text/Regex/* Text/Regex.hs @@ -67,11 +55,9 @@ $(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 + $(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)/Control/Monad/Identity.$O: $(OBJDIR)/Control/Monad.$O \ - $(OBJDIR)/Control/Monad/Fix.$O $(OBJDIR)/Foreign/Marshal/Alloc.$O: $(OBJDIR)/Data/Maybe.$O \ $(OBJDIR)/Foreign/Ptr.$O $(OBJDIR)/Foreign/Storable.$O \ $(OBJDIR)/Foreign/C/Types.$O @@ -84,26 +70,8 @@ $(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 +$(OBJDIR)/Foreign/C.$O: $(OBJDIR)/Foreign/C/Types.$O \ + $(OBJDIR)/Foreign/C/Error.$O $(OBJDIR)/Foreign/C/String.$O # C-files dependencies. Data/FiniteMap.$C: Data/Maybe.$C @@ -118,8 +86,6 @@ 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 Control/Monad/Fix.$C: System/IO.$C -Control/Monad/Identity.$C: Control/Monad.$C Control/Monad/Fix.$C -Control/Monad/Trans.$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 \ @@ -129,24 +95,5 @@ 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 +Foreign/C.$C: Foreign/C/Types.$C Foreign/C/Error.$C Foreign/C/String.$C