X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.nhc98;h=4acf0838dffc04829d190456874162051c53c7a9;hb=5699b7d4aefa303fd560fad2ae583f5fde676c65;hp=d3e39c8837b0e5a6f170fa93a5b216c9f573c448;hpb=7bab5eb4d4544736c6271c5b9763cb0d7b95b219;p=ghc-base.git diff --git a/Makefile.nhc98 b/Makefile.nhc98 index d3e39c8..4acf083 100644 --- a/Makefile.nhc98 +++ b/Makefile.nhc98 @@ -1,34 +1,26 @@ THISPKG = base SEARCH = -I$(TOPDIR)/targets/$(MACHINE) -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/Random.hs \ Foreign/Ptr.hs Foreign/StablePtr.hs Foreign/Storable.hs \ - Foreign/ForeignPtr.hs Foreign/C/Types.hs Foreign/C/TypesISO.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 @@ -39,8 +31,6 @@ SRCS = \ # 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 @@ -49,13 +39,20 @@ SRCS = \ # 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 @@ -75,32 +72,16 @@ $(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 # C-files dependencies. 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,24 +97,4 @@ 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