X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=d15b13e117c2b12c53d0dd7dcc60a1579f05735f;hb=bccd35aa801c910b7db3f94ac16f2b18bdf9f108;hp=cd27958eb8e562e6736bca1d402837299ba03a87;hpb=59b01588be22c60a67e500a6f60a3034e640b20f;p=ghc-base.git

diff --git a/Makefile b/Makefile
index cd27958..d15b13e 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ ALL_DIRS = \
 
 PACKAGE = base
 
-SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude -\#include HsBase.h
+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
@@ -74,12 +74,13 @@ 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
@@ -121,6 +122,16 @@ SRC_HADDOCK_OPTS += -t "Haskell Hierarchical Libraries ($(PACKAGE) package)" \
 
 # -----------------------------------------------------------------------------
 
+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
+
+# -----------------------------------------------------------------------------
+
 include $(TOP)/mk/target.mk
 
 ifeq "$(OBJECT_FILEFORMAT)" "PEi"