disambiguate uses of foldr for nhc98 to compile without errors

[haskell-directory.git] / Makefile

diff --git a/Makefile b/Makefile
index 61ce5f2..7d96616 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,8 @@ ALL_DIRS = \
        Control/Monad \
        Control/Monad/ST \
        Data \
+       Data/ByteString \
+       Data/ByteString/Lazy \
        Data/Generics \
        Data/Array \
        Data/Array/IO \
@@ -40,7 +42,7 @@ PACKAGE = base
 VERSION = 1.0
 
 SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude -"\#include" HsBase.h
-SRC_HSC2HS_OPTS += -Iinclude -I$(FPTOOLS_TOP)/ghc/includes
+SRC_HSC2HS_OPTS += -Iinclude -I$(GHC_INCLUDE_DIR)
 
 # -----------------------------------------------------------------------------
 # Per-module flags
@@ -51,19 +53,26 @@ SRC_HC_OPTS += -funbox-strict-fields
 # -----------------------------------------------------------------------------
 # PrimOpWrappers
 
-# These two lines are required for pre-processing ghc/compiler/prelude/primops.txt
+# These two lines are required for pre-processing compiler/prelude/primops.txt
 SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR)
 SRC_CPP_OPTS += ${GhcCppOpts}
 
 ifeq "$(BootingFromHc)" "YES"
-GHC/PrimopWrappers.hs:
+GHC/PrimopWrappers.hs: GHC/Prim.hs
        touch GHC/PrimopWrappers.hs
 else
-GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
+GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt GHC/Prim.hs
        @$(RM) $@
-       $(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
+       $(GENPRIMOP) --make-haskell-wrappers < $< > $@
 endif
 
+GHC/Prim.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
+       @$(RM) $@
+       $(GENPRIMOP) --make-haskell-source < $< > $@
+
+EXCLUDED_SRCS = GHC/Prim.hs
+EXTRA_HADDOCK_SRCS = GHC/Prim.hs
+
 boot :: GHC/PrimopWrappers.hs
 
 EXTRA_SRCS  += GHC/PrimopWrappers.hs
@@ -73,7 +82,7 @@ CLEAN_FILES += GHC/PrimopWrappers.hs
 ifneq "$(BootingFromHc)" "YES"
 STUBOBJS += \
    Control/Concurrent_stub.$(way_)o
-   
+
 CLEAN_FILES += $(STUBOBJS) \
    Control/Concurrent_stub.[ch]
 endif