X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2FMakefile;h=cd2a720ffb467222c7dfc6a5afa6d521fc9f9ea5;hb=2ce9f3af8a25f0ff3488a14ae2883111447f1c9c;hp=bdf9e6d8f1ce22fdf0193acf88cb0924817c8978;hpb=eebffd26fe450d655d5b99447f96d58f186ac413;p=ghc-hetmet.git

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index bdf9e6d..cd2a720 100644
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -1,51 +1,62 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.48 2000/12/11 10:18:51 simonmar Exp $
 #
 
 TOP=..
 CURRENT_DIR=ghc/driver
 include $(TOP)/mk/boilerplate.mk
 
-ifeq "$(GhcWithHscBuiltViaC)" "YES"
-HC=$(GHC_INPLACE)
+# hack for ghci-inplace script, see below
+INSTALLING=1
+
+ifeq "$(INSTALLING)" "1"	
+SUBDIRS = mangler split ghc ghci
 endif
 
-ghc_407_at_least = $(shell expr "$(GhcMinVersion)" \>= 7)
-ifeq "$(ghc_407_at_least)" "1"
+# -----------------------------------------------------------------------------
+# package configuration files...
+
+PKGCONF_OPTS = "$(TARGETPLATFORM)"		\
+	       "$(CURRENT_DIR)"			\
+	       "$(HaveLibGmp)"			\
+	       "$(LibsReadline)"		\
+	       "$(GHC_LIB_DIR)"			\
+	       "$(GHC_RUNTIME_DIR)"		\
+	       "$(GHC_UTILS_DIR)"		\
+	       "$(GHC_INCLUDE_DIR)"
+
+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
 
-SUBDIRS = mangler split stats
-
-# -----------------------------------------------------------------------------
-# package configuration files...
+SRC_HC_OPTS += -DWANT_PRETTY
+SRC_HC_OPTS += $(filter -D% -U%,$(GhcRtsCcOpts))
 
 all :: package.conf package.conf.inplace
 
-pkgconf : Config.o Package.o PackageSrc.o Utils.o
-	$(HC) $(HC_OPTS) $(LD_OPTS) Config.o Package.o PackageSrc.o Utils.o -o pkgconf
+HS_OBJS = Package.o PackageSrc.o Utils.o
+HS_PROG = pkgconf
 
-package.conf.inplace : pkgconf
-	./pkgconf in-place >$@
+package.conf.inplace : $(HS_PROG)
+	./$(HS_PROG) in-place $(PKGCONF_OPTS) >$@
 
 package.conf : pkgconf
-	./pkgconf install >$@
-
-INSTALL_DATAS += package.conf
+	./$(HS_PROG) install $(PKGCONF_OPTS) >$@
 
-CLEAN_FILES += pkgconf package.conf.inplace package.conf
+Package.o : ../utils/ghc-pkg/Package.hs
 
-# -----------------------------------------------------------------------------
-# installation...
+override datadir = $(libdir)
+INSTALL_DATAS += package.conf ghc-usage.txt
 
-override datadir=$(libdir)
-INSTALL_DATAS += ghc-usage.txt
+CLEAN_FILES += Main.hi pkgconf package.conf.inplace package.conf
 
 # -----------------------------------------------------------------------------