#-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.66 2002/02/12 15:17:22 simonmar Exp $
+# $Id: Makefile,v 1.69 2002/02/18 17:26:48 sof Exp $
#
# This is the Makefile for the runtime-system stuff.
# This stuff is written in C (and cannot be written in Haskell).
ALL_DIRS = hooks parallel
ifeq "$(HaveLibGmp)" "YES"
-PKG_CPP_OPTS += -DHAVE_LIBGMP
+PACKAGE_CPP_OPTS += -DHAVE_LIBGMP
endif
ifneq "$(DLLized)" "YES"
#WARNING_OPTS += -Wredundant-decls
#WARNING_OPTS += -Wconversion
-STANDARD_OPTS+=-I../includes -I. -Iparallel -DCOMPILING_RTS
+STANDARD_OPTS += -I../includes -I. -Iparallel
+# COMPILING_RTS is only used when building Win32 DLL support.
+STANDARD_OPTS += -DCOMPILING_RTS
# HC_OPTS is included in both .c and .hc compilations, whereas CC_OPTS is
# only included in .c compilations. HC_OPTS included the WAY_* opts, which
# must be included in both types of compilations.
SRC_CC_OPTS += $(WARNING_OPTS)
-
-# Don't bother adding these to CC_OPTS; get them via HC_OPTS anyway.
-SRC_MKDEPENDC_OPTS += $(STANDARD_OPTS)
-
-SRC_HC_OPTS += $(STANDARD_OPTS)
+SRC_CC_OPTS += $(STANDARD_OPTS)
SRC_CC_OPTS += $(GhcRtsCcOpts)
SRC_HC_OPTS += $(GhcRtsHcOpts)
ifeq "$(GhcRtsThreaded)" "YES"
ifeq "$(way)" ""
SRC_CC_OPTS += -DTHREADED_RTS
+PACKAGE_CPP_OPTS += -DTHREADED_RTS
endif
endif
+# If -DDEBUG is in effect, adjust package conf accordingly..
+ifneq "$(strip $(filter -DDEBUG,$(CC_OPTS)))" ""
+PACKAGE_CPP_OPTS += -DDEBUG
+endif
+
#-----------------------------------------------------------------------------
# Include the Front panel code?