X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=f1085cb1dba1f768d822fa0da8d9ea9785f54b25;hb=9bc25029ee43b36194a6003dded9a8d800a8a07a;hp=32af1eb111225d77d7b14ba868836f6bef21a681;hpb=e5af7dba16fcf5aa67218a4f4447c27eff0abfad;p=ghc-base.git

diff --git a/Makefile b/Makefile
index 32af1eb..f1085cb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,3 @@
-# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.11 2002/02/11 12:31:30 simonmar Exp $
-
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
@@ -11,64 +8,127 @@ SUBDIRS = cbits include
 ALL_DIRS = \
 	Control \
 	Control/Concurrent \
+	Control/Parallel \
 	Control/Monad \
 	Control/Monad/ST \
 	Data \
+	Data/Generics \
 	Data/Array \
-	Database \
+	Data/Array/IO \
+	Data/STRef \
 	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/Regex \
-	Text/Show
+	Text/Show \
+	Text/Read
 
-PKG = base
+PACKAGE = base
 
-SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude
+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
+
+# ESSENTIAL, for getting reasonable performance from the I/O library:
+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
 
 # -----------------------------------------------------------------------------
-# GHC/Prim.hi-boot
+ifneq "$(BootingFromHc)" "YES"
+STUBOBJS += \
+   Control/Concurrent_stub.$(way_)o
+   
+CLEAN_FILES += $(STUBOBJS) \
+   Control/Concurrent_stub.[ch]
+endif
 
-GHC/Prim.$(way_)hi	: GHC/Prim.hi-boot
-	cp $< $@
+#-----------------------------------------------------------------------------
+# 	Building the library for GHCi
+#
+# The procedure differs from that in fptools/mk/target.mk in one way:
+#  (*) on Win32 we must split it into two, because a single .o file can't
+#      have more than 65536 relocations in it [due to a bug in the GNU
+#      linker.]
 
-ALL_PRIMS = GHC/Prim.hi $(foreach way, $(WAYS), GHC/Prim.$(way)_hi)
+OBJECT_FILEFORMAT=unknown
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+OBJECT_FILEFORMAT=PEi
+endif
+ifeq "$(TARGETPLATFORM)" "i386-unknown-cygwin32"
+OBJECT_FILEFORMAT=PEi
+endif
 
-lib  : $(ALL_PRIMS)
+ifeq "$(OBJECT_FILEFORMAT)" "PEi"
 
-boot :: $(ALL_PRIMS)
+# Turn off standard rule which creates HSbase.o from LIBOBJS.
+DONT_WANT_STD_GHCI_LIB_RULE=YES
 
-CLEAN_FILES += $(ALL_PRIMS)
+GHCI_LIBOBJS = $(HS_OBJS)
+
+INSTALL_LIBS += HSbase1.o HSbase2.o HSbase3.o
+
+endif # OBJECT_FILEFORMAT = PEi
 
-SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional
+
+# -----------------------------------------------------------------------------
+# Doc building with Haddock
+
+EXCLUDED_HADDOCK_SRCS = \
+	GHC/PrimopWrappers.hs \
+	GHC/PArr.hs
+
+SRC_HADDOCK_OPTS += -t "Haskell Hierarchical Libraries ($(PACKAGE) package)" \
+	--no-implicit-prelude
 
 # -----------------------------------------------------------------------------
 
 include $(TOP)/mk/target.mk
 
+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) $(STUBOBJS))
+	@touch HSbase.o
+endif # OBJECT_FILEFORMAT = PEi
+