#-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.66 2001/07/24 05:05:41 ken Exp $
#
TOP=..
"$(GHC_LIB_DIR)" \
"$(GHC_RUNTIME_DIR)" \
"$(GHC_UTILS_DIR)" \
- "$(GHC_INCLUDE_DIR)"
+ "$(GHC_INCLUDE_DIR)" \
+ "$(X_CFLAGS)" \
+ "$(X_LIBS)"
-ghc_407_at_least = $(shell expr "$(GhcVersion)" \>= 4.07)
-ifeq "$(ghc_407_at_least)" "1"
+# the latter two are needed to setup the package details for hslibs/xlib
+
+SRC_HC_OPTS += -fglasgow-exts -cpp
+
+ghc_407_at_least = $(shell if (test $(GhcCanonVersion) -ge 407); then echo YES; else echo NO; fi)
+
+ifeq "$(ghc_407_at_least)" "YES"
+SRC_HC_OPTS += -package concurrent -package text
ifneq "$(mingw32_TARGET_OS)" "1"
-SRC_HC_OPTS += -fglasgow-exts -cpp -package concurrent -package posix -package text
-else
-SRC_HC_OPTS += -fglasgow-exts -cpp -package concurrent -package text
+SRC_HC_OPTS += -package posix
endif
else
-SRC_HC_OPTS += -fglasgow-exts -cpp -syslib concurrent -syslib posix -syslib misc
+SRC_HC_OPTS += -syslib concurrent -syslib posix -syslib misc
endif
SRC_HC_OPTS += -DWANT_PRETTY
-SRC_HC_OPTS += $(GhcHcOpts)
+SRC_HC_OPTS += $(filter -D% -U%,$(GhcRtsCcOpts))
all :: package.conf package.conf.inplace