projects
/
ghc-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-08-22 08:58:30 by panne]
[ghc-base.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
1edfbb2
..
b64e054
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,6
+1,3
@@
-# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.44 2003/07/23 15:39:54 simonmar Exp $
-
TOP=..
include $(TOP)/mk/boilerplate.mk
TOP=..
include $(TOP)/mk/boilerplate.mk
@@
-14,11
+11,11
@@
ALL_DIRS = \
Control/Monad \
Control/Monad/ST \
Data \
Control/Monad \
Control/Monad/ST \
Data \
+ Data/Generics \
Data/Array \
Data/Array/IO \
Data/STRef \
Debug \
Data/Array \
Data/Array/IO \
Data/STRef \
Debug \
- Debug/QuickCheck \
Foreign \
Foreign/C \
Foreign/Marshal \
Foreign \
Foreign/C \
Foreign/Marshal \
@@
-32,7
+29,6
@@
ALL_DIRS = \
Text/Html \
Text/PrettyPrint \
Text/ParserCombinators \
Text/Html \
Text/PrettyPrint \
Text/ParserCombinators \
- Text/ParserCombinators/Parsec \
Text/Regex \
Text/Show \
Text/Read
Text/Regex \
Text/Show \
Text/Read
@@
-57,6
+53,10
@@
SRC_HC_OPTS += -funbox-strict-fields
# -----------------------------------------------------------------------------
# PrimOpWrappers
# -----------------------------------------------------------------------------
# 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
ifeq "$(BootingFromHc)" "YES"
GHC/PrimopWrappers.hs:
touch GHC/PrimopWrappers.hs