X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=f1085cb1dba1f768d822fa0da8d9ea9785f54b25;hb=9bc25029ee43b36194a6003dded9a8d800a8a07a;hp=0bbd9abf953493f68bdf675ef2744658c8fe36ba;hpb=b90077303f7712efe392d5da077815e33f778571;p=ghc-base.git

diff --git a/Makefile b/Makefile
index 0bbd9ab..f1085cb 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,7 +36,7 @@ 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
 
 # If there is no system-supplied POSIX regex library, use our own
@@ -73,12 +74,13 @@ EXTRA_SRCS  += GHC/PrimopWrappers.hs
 CLEAN_FILES += GHC/PrimopWrappers.hs
 
 # -----------------------------------------------------------------------------
-
+ifneq "$(BootingFromHc)" "YES"
 STUBOBJS += \
    Control/Concurrent_stub.$(way_)o
    
 CLEAN_FILES += $(STUBOBJS) \
    Control/Concurrent_stub.[ch]
+endif
 
 #-----------------------------------------------------------------------------
 # 	Building the library for GHCi
@@ -116,7 +118,7 @@ EXCLUDED_HADDOCK_SRCS = \
 	GHC/PArr.hs
 
 SRC_HADDOCK_OPTS += -t "Haskell Hierarchical Libraries ($(PACKAGE) package)" \
-	--no-implicit-prelude -p prologue.txt
+	--no-implicit-prelude
 
 # -----------------------------------------------------------------------------
 
@@ -126,7 +128,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