[project @ 2002-01-29 19:26:38 by krasimir]

[ghc-hetmet.git] / ghc / driver / Makefile

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index 6241478..a7667bf 100644 (file)
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -1,5 +1,4 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.64 2001/06/12 17:07:23 simonmar Exp $
 #
 
 TOP=..
@@ -23,20 +22,27 @@ PKGCONF_OPTS = "$(TARGETPLATFORM)"          \
               "$(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 += $(filter -D% -U%,$(GhcRtsCcOpts))
 
 all :: package.conf package.conf.inplace
 
@@ -54,10 +60,6 @@ Package.o : ../utils/ghc-pkg/Package.hs
 override datadir = $(libdir)
 INSTALL_DATAS += package.conf ghc-usage.txt
 
-ifeq "$(BIN_DIST)" "1"
-INSTALL_PROGS += pkgconf
-endif
-
 CLEAN_FILES += Main.hi pkgconf package.conf.inplace package.conf
 
 # -----------------------------------------------------------------------------