X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=a8fb0a7337215ee23d0bc578ab7f9bbc5ca7cf95;hb=663c5280194debc636a19504df9d7a00f31e5455;hp=a557fe1cb7985ff51e8b94617e07d351810d299a;hpb=e7ddb1da757db6a5898d252e9aead0282965b405;p=haskell-directory.git

diff --git a/Makefile b/Makefile
index a557fe1..a8fb0a7 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,12 @@ SUBDIRS = cbits include
 ALL_DIRS = \
 	Control \
 	Control/Concurrent \
+	Control/Parallel \
 	Control/Monad \
 	Control/Monad/ST \
 	Data \
+	Data/ByteString \
+	Data/ByteString/Lazy \
 	Data/Generics \
 	Data/Array \
 	Data/Array/IO \
@@ -25,24 +28,19 @@ ALL_DIRS = \
 	System/Mem \
 	System/IO \
 	System/Posix \
+	System/Process \
+	System/Directory \
 	Text \
-	Text/Html \
 	Text/PrettyPrint \
 	Text/ParserCombinators \
-	Text/Regex \
 	Text/Show \
 	Text/Read
 
 PACKAGE = base
+VERSION = 2.0
 
-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
-ifneq "$(HavePosixRegex)" "YES"
-SRC_HC_OPTS     += -Icbits/regex
-SRC_HSC2HS_OPTS += -Icbits/regex
-endif
+SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude -"\#include" HsBase.h
+SRC_HSC2HS_OPTS += -Iinclude -I$(GHC_INCLUDE_DIR)
 
 # -----------------------------------------------------------------------------
 # Per-module flags
@@ -53,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}
 
@@ -61,23 +59,31 @@ 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
 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
@@ -98,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
 
@@ -114,18 +120,21 @@ 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
 
 # -----------------------------------------------------------------------------
 
-include $(TOP)/mk/target.mk
+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
 
-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))
-	@touch HSbase.o
-endif # OBJECT_FILEFORMAT = PEi
+System/Posix/Types.o Foreign/C/Types.o: include/CTypes.h
 
+# -----------------------------------------------------------------------------
+
+DIST_CLEAN_FILES += base.buildinfo config.cache config.status
+
+include $(TOP)/mk/target.mk