projects
/
ghc-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2005-03-14 15:22:51 by simonmar]
[ghc-base.git]
/
cbits
/
Makefile
diff --git
a/cbits/Makefile
b/cbits/Makefile
index
2a6ac7d
..
b1bbba6
100644
(file)
--- a/
cbits/Makefile
+++ b/
cbits/Makefile
@@
-1,7
+1,8
@@
-# $Id: Makefile,v 1.10 2004/08/16 11:07:31 simonmar Exp $
+# $Id: Makefile,v 1.14 2005/02/01 00:52:22 ross Exp $
TOP = ../..
include $(TOP)/mk/boilerplate.mk
TOP = ../..
include $(TOP)/mk/boilerplate.mk
+-include ../config.mk
HC = $(GHC_INPLACE)
HC = $(GHC_INPLACE)
@@
-14,14
+15,12
@@
SRC_CC_OPTS += -Iregex
EXCLUDED_SRCS += regex/engine.c
endif
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
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
EXCLUDED_SRCS += consUtils.c
endif
SRC_CC_OPTS += -Wall -DCOMPILING_STDLIB
-SRC_CC_OPTS += -I$(GHC_RUNTIME_DIR) -I../include
+SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) -I$(GHC_RUNTIME_DIR) -I../include
LIBRARY = libHSbase_cbits.a
LIBOBJS = $(C_OBJS)
LIBRARY = libHSbase_cbits.a
LIBOBJS = $(C_OBJS)