# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.136 2001/02/11 17:14:48 simonmar Exp $
+# $Id: Makefile,v 1.139 2001/02/14 11:54:33 simonmar Exp $
TOP = ..
include $(TOP)/mk/boilerplate.mk
# Only include GHCi if we're bootstrapping with at least version 411
ifeq "$(GhcWithInterpreter)" "YES"
ifeq "$(ghc_411_at_least)" "1"
-SRC_HC_OPTS += -DGHCI -optc-DGHCI
+SRC_HC_OPTS += -DGHCI
DIRS += ghci
endif
endif
HS_SRCS := $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs) $(wildcard $(dir)/*.hs))
-HS_SRCS := $(filter-out rename/ParseIface.hs parser/Parser.hs, $(HS_SRCS))
+HS_SRCS := $(filter-out rename/ParseIface.hs parser/Parser.hs $(CONFIG_HS), $(HS_SRCS))
+HS_SRCS += $(CONFIG_HS)
ifneq "$(GhcWithHscBuiltViaC)" "YES"
HS_SRCS += rename/ParseIface.hs parser/Parser.hs
utils/PrimPacked_HC_OPTS = -fvia-C -monly-3-regs -funfolding-interface-threshold7
+# ByteCodeItbls uses primops that the NCG doesn't support yet.
+ghci/ByteCodeItbls_HC_OPTS = -fvia-C
+
# ----------------------------------------------------------------------------
# C compilations
primop-usage.hs-incl \
primop-primop-info.hs-incl
-prelude/PrimOp.o: $(PRIMOP_BITS)
+prelude/PrimOp.lhs prelude/PrimOp.o: $(PRIMOP_BITS)
depend :: $(PRIMOP_BITS)