[project @ 2003-08-04 14:47:37 by panne]

[ghc-base.git] / Makefile

diff --git a/Makefile b/Makefile
index 72446d9..ebc5f2e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.43 2003/05/30 09:19:39 simonpj Exp $
+# $Id: Makefile,v 1.47 2003/07/31 17:45:22 ross Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -14,6 +14,7 @@ ALL_DIRS = \
        Control/Monad \
        Control/Monad/ST \
        Data \
+       Data/Generics \
        Data/Array \
        Data/Array/IO \
        Data/STRef \
@@ -32,7 +33,6 @@ ALL_DIRS = \
        Text/Html \
        Text/PrettyPrint \
        Text/ParserCombinators \
-       Text/ParserCombinators/Parsec \
        Text/Regex \
        Text/Show \
        Text/Read
@@ -57,9 +57,18 @@ SRC_HC_OPTS += -funbox-strict-fields
 # -----------------------------------------------------------------------------
 # PrimOpWrappers
 
+# These two lines are required for pre-processing ghc/compiler/prelude/primops.txt
+SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR)
+SRC_CPP_OPTS += ${GhcCppOpts}
+
+ifeq "$(BootingFromHc)" "YES"
+GHC/PrimopWrappers.hs:
+       touch GHC/PrimopWrappers.hs
+else
 GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
        @$(RM) $@
        $(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
+endif
 
 boot :: GHC/PrimopWrappers.hs