X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=5992c254bfeb6c35bf6cfd6759dcf3c51c7ffa1e;hb=b72f2fe092981ea4233e42c67a1921dee36c9e56;hp=03a812f06120faff60905d3b67c3617f3a09e4ce;hpb=01eafdd54e3f18c0ae1cc0c43daf0f02dfeece68;p=haskell-directory.git

diff --git a/Makefile b/Makefile
index 03a812f..5992c25 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,3 @@
-# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.33 2002/06/20 16:12:58 simonmar Exp $
-
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
@@ -14,40 +11,36 @@ ALL_DIRS = \
 	Control/Monad \
 	Control/Monad/ST \
 	Data \
+	Data/Generics \
 	Data/Array \
+	Data/Array/IO \
 	Data/STRef \
-	Database \
 	Debug \
-	Debug/QuickCheck \
-	FileFormat \
 	Foreign \
 	Foreign/C \
 	Foreign/Marshal \
 	GHC \
-	Hugs \
-	Language \
-	Network \
-	NHC \
 	System \
 	System/Console \
 	System/Mem \
 	System/IO \
+	System/Posix \
 	Text \
 	Text/Html \
 	Text/PrettyPrint \
 	Text/ParserCombinators \
-	Text/ParserCombinators/Parsec \
 	Text/Regex \
 	Text/Show \
 	Text/Read
 
 PACKAGE = base
 
-SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude
-SRC_HSC2HS_OPTS += -Iinclude
+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
@@ -61,15 +54,32 @@ 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
+else
 GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
-	rm -f $@
+	@$(RM) $@
 	$(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
+endif
 
 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
 #
@@ -102,10 +112,11 @@ endif # OBJECT_FILEFORMAT = PEi
 # Doc building with Haddock
 
 EXCLUDED_HADDOCK_SRCS = \
-	Data/Generics.hs \
+	GHC/PrimopWrappers.hs \
 	GHC/PArr.hs
 
-SRC_HADDOCK_OPTS += -t "Haskell Core Libraries"
+SRC_HADDOCK_OPTS += -t "Haskell Core Libraries (base package)" \
+	--no-implicit-prelude -p prologue.txt
 
 # -----------------------------------------------------------------------------