X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=b64e054603651c1ae70962f415447e23484e5b24;hb=3c4dcb4f0fc64c1ddc1ef9eecfaf204bdaf0d5d5;hp=1edfbb2bf5738a5eae3730a86a1461b547310b08;hpb=6096198cd629bddb79f902d11b92cb64b28c1a79;p=haskell-directory.git diff --git a/Makefile b/Makefile index 1edfbb2..b64e054 100644 --- 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 @@ -14,11 +11,11 @@ ALL_DIRS = \ Control/Monad \ Control/Monad/ST \ Data \ + Data/Generics \ Data/Array \ Data/Array/IO \ Data/STRef \ Debug \ - Debug/QuickCheck \ Foreign \ Foreign/C \ Foreign/Marshal \ @@ -32,7 +29,6 @@ ALL_DIRS = \ Text/Html \ Text/PrettyPrint \ Text/ParserCombinators \ - Text/ParserCombinators/Parsec \ Text/Regex \ Text/Show \ Text/Read @@ -57,6 +53,10 @@ 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