X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=640c9e781a64dc89859d176b6320fe7ea7de3368;hb=b565ba5924ed552c9184bbb66b921f2a18f87b1b;hp=1edfbb2bf5738a5eae3730a86a1461b547310b08;hpb=6096198cd629bddb79f902d11b92cb64b28c1a79;p=ghc-base.git

diff --git a/Makefile b/Makefile
index 1edfbb2..640c9e7 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
 
@@ -11,14 +8,15 @@ SUBDIRS = cbits include
 ALL_DIRS = \
 	Control \
 	Control/Concurrent \
+	Control/Parallel \
 	Control/Monad \
 	Control/Monad/ST \
 	Data \
+	Data/Generics \
 	Data/Array \
 	Data/Array/IO \
 	Data/STRef \
 	Debug \
-	Debug/QuickCheck \
 	Foreign \
 	Foreign/C \
 	Foreign/Marshal \
@@ -32,18 +30,18 @@ ALL_DIRS = \
 	Text/Html \
 	Text/PrettyPrint \
 	Text/ParserCombinators \
-	Text/ParserCombinators/Parsec \
 	Text/Regex \
 	Text/Show \
 	Text/Read
 
 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
@@ -57,6 +55,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
@@ -71,6 +73,14 @@ boot :: GHC/PrimopWrappers.hs
 EXTRA_SRCS  += GHC/PrimopWrappers.hs
 CLEAN_FILES += GHC/PrimopWrappers.hs
 
+# -----------------------------------------------------------------------------
+
+STUBOBJS += \
+   Control/Concurrent_stub.$(way_)o
+   
+CLEAN_FILES += $(STUBOBJS) \
+   Control/Concurrent_stub.[ch]
+
 #-----------------------------------------------------------------------------
 # 	Building the library for GHCi
 #
@@ -106,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
 
 # -----------------------------------------------------------------------------
 
@@ -117,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