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

diff --git a/Makefile b/Makefile
index 25c14b5..a8fb0a7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,74 +1,140 @@
-# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.3 2001/07/04 10:48:16 simonmar Exp $
-
-TOP=../..
+TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-ifeq "$(way)" ""
-SUBDIRS = cbits
-else
-SUBDIRS=
-endif
+# -----------------------------------------------------------------------------
+
+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 \
-	Database \
+	Data/Array/IO \
+	Data/STRef \
 	Debug \
-	FileFormat \
 	Foreign \
 	Foreign/C \
 	Foreign/Marshal \
 	GHC \
-	Hugs \
-	Language \
-	Network \
-	NHC \
 	System \
+	System/Console \
+	System/Mem \
 	System/IO \
+	System/Posix \
+	System/Process \
+	System/Directory \
 	Text \
-	Text/Show
+	Text/PrettyPrint \
+	Text/ParserCombinators \
+	Text/Show \
+	Text/Read
 
-PRE_SRCS += $(wildcard $(patsubst %, %/*.hsc, $(ALL_DIRS)))
-SRC_HSC2HS_OPTS += -Iinclude -I.
+PACKAGE = base
+VERSION = 2.0
 
-ALL_HS_SRCS = $(wildcard $(patsubst %, %/*.hs, . $(ALL_DIRS)))
-ALL_LHS_SRCS += $(wildcard GHC/*.lhs)
-ALL_HS_OBJS = $(patsubst %.hs, %.o, $(ALL_HS_SRCS)) \
-	$(patsubst %.lhs, %.o, $(ALL_LHS_SRCS))
-ALL_HS_HIS = $(patsubst %.o, %.hi, $(ALL_HS_OBJS))
+SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude -"\#include" HsBase.h
+SRC_HSC2HS_OPTS += -Iinclude -I$(GHC_INCLUDE_DIR)
 
-srcs : $(HS_SRCS) GHC/Prim.$(way_)hi
+# -----------------------------------------------------------------------------
+# Per-module flags
 
-# dependencies between .hsc files
-GHC/IO.hs : GHC/Handle.hs
+# ESSENTIAL, for getting reasonable performance from the I/O library:
+SRC_HC_OPTS += -funbox-strict-fields
 
-GHC/Prim.$(way_)hi : GHC/Prim.hi-boot
-	cp $< $@
+# -----------------------------------------------------------------------------
+# PrimOpWrappers
 
-SRC_HC_OPTS += -cpp -fglasgow-exts -fvia-C -I$(FPTOOLS_TOP)/ghc/includes -Iinclude -package-name core -H128m $(GhcLibHcOpts)
+# These two lines are required for pre-processing compiler/prelude/primops.txt
+SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR)
+SRC_CPP_OPTS += ${GhcCppOpts}
 
-LIBNAME = libHScore$(_way).a
+ifeq "$(BootingFromHc)" "YES"
+GHC/PrimopWrappers.hs:
+	touch GHC/PrimopWrappers.hs
+else
+GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt GHC/Prim.hs
+	@$(RM) $@
+	$(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
 
-CLEAN_FILES += $(ALL_HS_OBJS) $(ALL_HS_HIS)
+EXTRA_SRCS  += GHC/PrimopWrappers.hs
+CLEAN_FILES += GHC/PrimopWrappers.hs
 
-all :: $(LIBNAME)
+# -----------------------------------------------------------------------------
+ifneq "$(BootingFromHc)" "YES"
+STUBOBJS += \
+   Control/Concurrent_stub.$(way_)o
 
-lib : srcs
-	$(GHC_INPLACE) $(HC_OPTS) --make $(ALL_HS_SRCS) $(ALL_LHS_SRCS)
+CLEAN_FILES += $(STUBOBJS) \
+   Control/Concurrent_stub.[ch]
+endif
 
-$(LIBNAME) : lib
-	$(RM) $@
-	$(AR) $(AR_OPTS) $@ $(ALL_HS_OBJS)
-	$(RANLIB) $@
+#-----------------------------------------------------------------------------
+# 	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.]
+
+OBJECT_FILEFORMAT=unknown
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+OBJECT_FILEFORMAT=PEi
+endif
+ifeq "$(TARGETPLATFORM)" "i386-unknown-cygwin32"
+OBJECT_FILEFORMAT=PEi
+endif
+
+ifeq "$(OBJECT_FILEFORMAT)" "PEi"
+
+# Turn off standard rule which creates HSbase.o from LIBOBJS.
+#DONT_WANT_STD_GHCI_LIB_RULE=YES
+
+GHCI_LIBOBJS = $(HS_OBJS)
+
+INSTALL_LIBS += HSbase.o
+
+endif # OBJECT_FILEFORMAT = PEi
+
+
+# -----------------------------------------------------------------------------
+# 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
+
+# -----------------------------------------------------------------------------
+
+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
+
+# -----------------------------------------------------------------------------
 
-%.o : %.hs
-	$(GHC_INPLACE) $(HC_OPTS) --make $<
-%.o : %.lhs
-	$(GHC_INPLACE) $(HC_OPTS) --make $<
+DIST_CLEAN_FILES += base.buildinfo config.cache config.status
 
 include $(TOP)/mk/target.mk