X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=d00bffeb489f0b4fd4a9e6ceed99c61f3f417911;hb=b9756aa906e938841a289c23fd637f19a40f9c5f;hp=597ce3091838d6fa4b36dcc6eb095c0515060860;hpb=2e4f25ef5bb423ea9abe25392d316d3b9c369694;p=haskell-directory.git

diff --git a/Makefile b/Makefile
index 597ce30..d00bffe 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ ALL_DIRS = \
 	Control/Monad \
 	Control/Monad/ST \
 	Data \
+	Data/ByteString \
 	Data/Generics \
 	Data/Array \
 	Data/Array/IO \
@@ -40,7 +41,7 @@ PACKAGE = base
 VERSION = 1.0
 
 SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude -"\#include" HsBase.h
-SRC_HSC2HS_OPTS += -Iinclude -I$(FPTOOLS_TOP)/ghc/includes
+SRC_HSC2HS_OPTS += -Iinclude -I$(GHC_INCLUDE_DIR)
 
 # -----------------------------------------------------------------------------
 # Per-module flags
@@ -51,19 +52,26 @@ SRC_HC_OPTS += -funbox-strict-fields
 # -----------------------------------------------------------------------------
 # PrimOpWrappers
 
-# These two lines are required for pre-processing ghc/compiler/prelude/primops.txt
+# 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:
+GHC/PrimopWrappers.hs: GHC/Prim.hs
 	touch GHC/PrimopWrappers.hs
 else
-GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
+GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt GHC/Prim.hs
 	@$(RM) $@
-	$(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
+	$(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
@@ -73,7 +81,7 @@ CLEAN_FILES += GHC/PrimopWrappers.hs
 ifneq "$(BootingFromHc)" "YES"
 STUBOBJS += \
    Control/Concurrent_stub.$(way_)o
-   
+
 CLEAN_FILES += $(STUBOBJS) \
    Control/Concurrent_stub.[ch]
 endif
@@ -97,11 +105,11 @@ 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 HSbase3.o
+INSTALL_LIBS += HSbase.o
 
 endif # OBJECT_FILEFORMAT = PEi
 
@@ -131,12 +139,3 @@ System/Posix/Types.o Foreign/C/Types.o: include/CTypes.h
 DIST_CLEAN_FILES += base.buildinfo config.cache config.status config.mk
 
 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
-