X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=2c8aeadcae5eef42e141c9f07e6181c7713da233;hb=ad2464d7646b2b0745615f4a23967444e23fea40;hp=5992c254bfeb6c35bf6cfd6759dcf3c51c7ffa1e;hpb=182f10e70b087b7f2b427fa17e3ce84bdaf8c59a;p=ghc-base.git

diff --git a/Makefile b/Makefile
index 5992c25..2c8aead 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 \
@@ -25,6 +26,8 @@ ALL_DIRS = \
 	System/Mem \
 	System/IO \
 	System/Posix \
+	System/Process \
+	System/Directory \
 	Text \
 	Text/Html \
 	Text/PrettyPrint \
@@ -34,17 +37,11 @@ ALL_DIRS = \
 	Text/Read
 
 PACKAGE = base
+VERSION = 1.0
 
-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
-ifneq "$(HavePosixRegex)" "YES"
-# Make sure we can get hold of regex.h
-SRC_HC_OPTS     += -Icbits/regex
-SRC_HSC2HS_OPTS += -Icbits/regex
-endif
-
 # -----------------------------------------------------------------------------
 # Per-module flags
 
@@ -73,12 +70,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
@@ -115,8 +113,18 @@ 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
+
+# -----------------------------------------------------------------------------
+
+GHC/ForeignPtr.o Data/Array/IO/Internals.o Data/Array/Base.o \
+  Data/Generics/Instances.o Data/Complex.o Data/Array.o Data/STRef.o \
+  Data/Dynamic.o Data/Typeable.o Data/PackedString.o System/Mem/Weak.o \
+  System/Mem/StableName.o System/Posix/Types.o Control/Monad/ST.o \
+  Control/Exception.o Foreign/C/Types.o Foreign/ForeignPtr.o: include/Typeable.h
+
+System/Posix/Types.o Foreign/C/Types.o: include/CTypes.h
 
 # -----------------------------------------------------------------------------
 
@@ -126,7 +134,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