X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=640c9e781a64dc89859d176b6320fe7ea7de3368;hb=ed5427e38b5dc7543ae0fbb1252f9a65061dee7f;hp=a557fe1cb7985ff51e8b94617e07d351810d299a;hpb=e7ddb1da757db6a5898d252e9aead0282965b405;p=ghc-base.git

diff --git a/Makefile b/Makefile
index a557fe1..640c9e7 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ SUBDIRS = cbits include
 ALL_DIRS = \
 	Control \
 	Control/Concurrent \
+	Control/Parallel \
 	Control/Monad \
 	Control/Monad/ST \
 	Data \
@@ -35,11 +36,12 @@ ALL_DIRS = \
 
 PACKAGE = base
 
-SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude -\#include HsBase.h
+SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude -"\#include" HsBase.h
 SRC_HSC2HS_OPTS += -Iinclude -I$(FPTOOLS_TOP)/ghc/includes
 
-# Make sure we can get hold of regex.h
+# 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
@@ -114,8 +116,8 @@ EXCLUDED_HADDOCK_SRCS = \
 	GHC/PrimopWrappers.hs \
 	GHC/PArr.hs
 
-SRC_HADDOCK_OPTS += -t "Haskell Core Libraries (base package)" \
-	--no-implicit-prelude -p prologue.txt
+SRC_HADDOCK_OPTS += -t "Haskell Hierarchical Libraries ($(PACKAGE) package)" \
+	--no-implicit-prelude
 
 # -----------------------------------------------------------------------------
 
@@ -125,7 +127,7 @@ 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))
+	$(LD) -r $(LD_X) -o HSbase3.o $(filter-out GHC/% Text/%, $(GHCI_LIBOBJS) $(STUBOBJS))
 	@touch HSbase.o
 endif # OBJECT_FILEFORMAT = PEi