X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=249f6aaec7cc1e4503e0e2d21c1cac5d7a739e87;hb=a7fdfabc5f9d97b2cbcd6fe80b70f0b2d1d0db95;hp=8cc4bf39f540a3298b4cc0214d227c93e43aaa8b;hpb=9a53a070bb647bd7796596e27a6348ae3ba6eed7;p=ghc-base.git

diff --git a/Makefile b/Makefile
index 8cc4bf3..249f6aa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.36 2002/07/02 13:13:36 simonmar Exp $
+# $Id: Makefile,v 1.41 2003/03/06 09:51:03 simonmar Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -15,23 +15,19 @@ ALL_DIRS = \
 	Control/Monad/ST \
 	Data \
 	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 \
@@ -43,8 +39,8 @@ ALL_DIRS = \
 
 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
 ifneq "$(HavePosixRegex)" "YES"
@@ -62,7 +58,7 @@ SRC_HC_OPTS += -funbox-strict-fields
 # PrimOpWrappers
 
 GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
-	rm -f $@
+	@$(RM) $@
 	$(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
 
 boot :: GHC/PrimopWrappers.hs