[project @ 2001-06-28 10:25:30 by sewardj]

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

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index bdf9e6d..e38b6ef 100644 (file)
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -1,16 +1,31 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.48 2000/12/11 10:18:51 simonmar Exp $
+# $Id: Makefile,v 1.65 2001/06/12 17:08:11 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)
+# -----------------------------------------------------------------------------
+# package configuration files...
+
+PKGCONF_OPTS = "$(TARGETPLATFORM)"             \
+              "$(CURRENT_DIR)"                 \
+              "$(HaveLibGmp)"                  \
+              "$(LibsReadline)"                \
+              "$(GHC_LIB_DIR)"                 \
+              "$(GHC_RUNTIME_DIR)"             \
+              "$(GHC_UTILS_DIR)"               \
+              "$(GHC_INCLUDE_DIR)"
+
+ghc_407_at_least = $(shell expr "$(GhcVersion)" \>= 4.07)
 ifeq "$(ghc_407_at_least)" "1"
 ifneq "$(mingw32_TARGET_OS)" "1"
 SRC_HC_OPTS += -fglasgow-exts -cpp -package concurrent -package posix -package text
@@ -21,31 +36,25 @@ else
 SRC_HC_OPTS += -fglasgow-exts -cpp -syslib concurrent -syslib posix -syslib misc
 endif
 
-SUBDIRS = mangler split stats
-
-# -----------------------------------------------------------------------------
-# package configuration files...
+SRC_HC_OPTS += -DWANT_PRETTY
 
 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 >$@
+       ./$(HS_PROG) install $(PKGCONF_OPTS) >$@
 
-INSTALL_DATAS += package.conf
+Package.o : ../utils/ghc-pkg/Package.hs
 
-CLEAN_FILES += pkgconf package.conf.inplace package.conf
-
-# -----------------------------------------------------------------------------
-# 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
 
 # -----------------------------------------------------------------------------