Data.Graph is now portable (enable for nhc98)

[haskell-directory.git] / Makefile

diff --git a/Makefile b/Makefile
index 08da6a7..a8fb0a7 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 \
@@ -29,25 +31,16 @@ ALL_DIRS = \
        System/Process \
        System/Directory \
        Text \
-       Text/Html \
        Text/PrettyPrint \
        Text/ParserCombinators \
-       Text/Regex \
        Text/Show \
        Text/Read
 
 PACKAGE = base
-VERSION = 1.0
+VERSION = 2.0
 
 SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude -"\#include" HsBase.h
-SRC_HSC2HS_OPTS += -Iinclude -I$(FPTOOLS_TOP)/ghc/includes
-
-# If there is no system-supplied POSIX regex library, use our own
-ifneq "$(HavePosixRegex)" "YES"
-# Make sure we can get hold of regex.h
-SRC_HC_OPTS     += -Icbits/regex
-SRC_HSC2HS_OPTS += -Icbits/regex
-endif
+SRC_HSC2HS_OPTS += -Iinclude -I$(GHC_INCLUDE_DIR)
 
 # -----------------------------------------------------------------------------
 # Per-module flags
@@ -58,7 +51,7 @@ 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}
 
@@ -66,11 +59,18 @@ ifeq "$(BootingFromHc)" "YES"
 GHC/PrimopWrappers.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
@@ -80,7 +80,7 @@ CLEAN_FILES += GHC/PrimopWrappers.hs
 ifneq "$(BootingFromHc)" "YES"
 STUBOBJS += \
    Control/Concurrent_stub.$(way_)o
-   
+
 CLEAN_FILES += $(STUBOBJS) \
    Control/Concurrent_stub.[ch]
 endif
@@ -104,11 +104,11 @@ endif
 ifeq "$(OBJECT_FILEFORMAT)" "PEi"
 
 # Turn off standard rule which creates HSbase.o from LIBOBJS.
-DONT_WANT_STD_GHCI_LIB_RULE=YES
+#DONT_WANT_STD_GHCI_LIB_RULE=YES
 
 GHCI_LIBOBJS = $(HS_OBJS)
 
-INSTALL_LIBS += HSbase1.o HSbase2.o HSbase3.o
+INSTALL_LIBS += HSbase.o
 
 endif # OBJECT_FILEFORMAT = PEi
 
@@ -135,13 +135,6 @@ System/Posix/Types.o Foreign/C/Types.o: include/CTypes.h
 
 # -----------------------------------------------------------------------------
 
-include $(TOP)/mk/target.mk
-
-ifeq "$(OBJECT_FILEFORMAT)" "PEi"
-HSbase.o : $(GHCI_LIBOBJS)
-       $(LD) -r $(LD_X) -o HSbase1.o $(filter     GHC/%, $(GHCI_LIBOBJS))
-       $(LD) -r $(LD_X) -o HSbase2.o $(filter     Text/%, $(GHCI_LIBOBJS))
-       $(LD) -r $(LD_X) -o HSbase3.o $(filter-out GHC/% Text/%, $(GHCI_LIBOBJS) $(STUBOBJS))
-       @touch HSbase.o
-endif # OBJECT_FILEFORMAT = PEi
+DIST_CLEAN_FILES += base.buildinfo config.cache config.status
 
+include $(TOP)/mk/target.mk