X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=cbits%2FMakefile;h=fcdb8e4690101a85e8ce840d5f77760c891eeaa7;hb=7c0b04fd273621130062418bb764809c79488dd2;hp=14b18d42bb19b3b7ece5fe771f0fb095c63a2cee;hpb=76fd5f14dd57a2abfd70fa76bd1936c271bdfd9f;p=haskell-directory.git

diff --git a/cbits/Makefile b/cbits/Makefile
index 14b18d4..fcdb8e4 100644
--- a/cbits/Makefile
+++ b/cbits/Makefile
@@ -1,21 +1,18 @@
-# $Id: Makefile,v 1.6 2002/02/14 14:05:48 simonmar Exp $
+# $Id: Makefile,v 1.14 2005/02/01 00:52:22 ross Exp $
 
 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
 HC = $(GHC_INPLACE)
 
-ifneq "$(HavePosixRegex)" "YES"
-ALL_DIRS      += regex
-SRC_CC_OPTS   += -Iregex
-EXCLUDED_SRCS += regex/engine.c
-INSTALL_DATAS += regex/regex.h
-endif
+UseGhcForCc = YES
 
-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)