X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=cbits%2FMakefile;h=0082ae79a0bc83ff95c0c69297e75435a2d3204c;hb=77a47fd973802d084a2a0118e4906368196edc11;hp=dd6a6aee424f6eaf9898a4e76317a2f357724ff1;hpb=182f10e70b087b7f2b427fa17e3ce84bdaf8c59a;p=haskell-directory.git

diff --git a/cbits/Makefile b/cbits/Makefile
index dd6a6ae..0082ae7 100644
--- a/cbits/Makefile
+++ b/cbits/Makefile
@@ -1,10 +1,13 @@
-# $Id: Makefile,v 1.9 2003/10/20 13:16:58 simonmar Exp $
+# $Id: Makefile,v 1.14 2005/02/01 00:52:22 ross Exp $
 
 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
+-include ../config.mk
 
 HC = $(GHC_INPLACE)
 
+UseGhcForCc = YES
+
 # If there is no system-supplied POSIX regex library, use our own
 ifneq "$(HavePosixRegex)" "YES"
 ALL_DIRS      += regex
@@ -12,14 +15,12 @@ SRC_CC_OPTS   += -Iregex
 EXCLUDED_SRCS += regex/engine.c
 endif
 
-EXCLUDED_SRCS += ilxstubs.c
-
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 EXCLUDED_SRCS += consUtils.c
 endif
 
 SRC_CC_OPTS += -Wall -DCOMPILING_STDLIB 
-SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) -I$(GHC_RUNTIME_DIR) -I../include
+SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) -I$(GHC_RTS_DIR) -I../include
 
 LIBRARY = libHSbase_cbits.a
 LIBOBJS = $(C_OBJS)