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

diff --git a/Makefile b/Makefile
index 9fac0fa..a8fb0a7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,3 @@
-# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.25 2002/04/26 13:26:39 simonmar Exp $
-
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
@@ -11,44 +8,39 @@ 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 \
-	Debug/QuickCheck \
-	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/Html \
 	Text/PrettyPrint \
 	Text/ParserCombinators \
-	Text/Regex \
 	Text/Show \
 	Text/Read
 
 PACKAGE = base
+VERSION = 2.0
 
-SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude
-SRC_HSC2HS_OPTS += -Iinclude
-
-# 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
@@ -59,67 +51,90 @@ SRC_HC_OPTS += -funbox-strict-fields
 # -----------------------------------------------------------------------------
 # PrimOpWrappers
 
-GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
-	rm -f $@
-	$(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
+# These two lines are required for pre-processing 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 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
 
+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
 #
 # 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.
+#      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
+#DONT_WANT_STD_GHCI_LIB_RULE=YES
 
 GHCI_LIBOBJS = $(HS_OBJS)
 
-INSTALL_LIBS += HSbase1.o HSbase2.o
+INSTALL_LIBS += HSbase.o
 
-endif # TARGETPLATFORM = i386-unknown-mingw32
+endif # OBJECT_FILEFORMAT = PEi
 
 
 # -----------------------------------------------------------------------------
 # Doc building with Haddock
 
 EXCLUDED_HADDOCK_SRCS = \
-	GHC/Err.lhs \
-	Data/Generics.hs \
+	GHC/PrimopWrappers.hs \
 	GHC/PArr.hs
 
-HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
-
-HADDOCK = $(FPTOOLS_TOP)/haddock/src/haddock-inplace
-
-# Urgh, hack needed to ensure that the value of HS_SRCS is computed in time for
-# the docs rule below.
-PRE_SRCS := $(ALL_SRCS)
+SRC_HADDOCK_OPTS += -t "Haskell Hierarchical Libraries ($(PACKAGE) package)" \
+	--no-implicit-prelude
 
-.PHONY: docs
-haddock-docs : $(HS_PPS)
-	$(HADDOCK) -t "Haskell Core Libraries" -h -s "." $(HS_PPS)
+# -----------------------------------------------------------------------------
 
-%.raw-hs : %.lhs
-	$(GHC_INPLACE) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
+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
 
-%.raw-hs : %.hs
-	$(GHC_INPLACE) $(HC_OPTS) -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
+System/Posix/Types.o Foreign/C/Types.o: include/CTypes.h
 
 # -----------------------------------------------------------------------------
 
-include $(TOP)/mk/target.mk
-
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-HSbase.o : $(GHCI_LIBOBJS)
-	$(LD) -r $(LD_X) -o HSbase1.o $(filter     GHC/%, $(GHCI_LIBOBJS))
-	$(LD) -r $(LD_X) -o HSbase2.o $(filter-out GHC/%, $(GHCI_LIBOBJS))
-	@touch HSbase.o
-endif # TARGETPLATFORM = i386-unknown-mingw32
+DIST_CLEAN_FILES += base.buildinfo config.cache config.status
 
+include $(TOP)/mk/target.mk