X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2FMakefile;h=b0c4b638d9afe6afc297dfd75052f39ad58f5e7e;hb=6b66614bea48aab60707c5dc19c0d73abe9e3a15;hp=524abd43d461f9f9848a9f56d12ee3016d9f0571;hpb=799ba0256a0098c662ac195362f5e426bd52024f;p=ghc-hetmet.git

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index 524abd4..b0c4b63 100644
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -1,16 +1,31 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.50 2000/12/20 10:42:54 simonmar Exp $
+# $Id: Makefile,v 1.68 2001/08/04 06:09:24 ken 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,56 +36,26 @@ else
 SRC_HC_OPTS += -fglasgow-exts -cpp -syslib concurrent -syslib posix -syslib misc
 endif
 
-SUBDIRS = mangler split
-
-# -----------------------------------------------------------------------------
-# Create compiler configuration
-
-CURRENT_DIR=ghc/compiler
-CONFIG_HS = Config.hs
-boot :: $(CONFIG_HS)
-
-$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
-	@$(RM) -f $(CONFIG_HS)
-	@echo -n "Creating $(CONFIG_HS) ... "
-	@echo "module Config where" >>$(CONFIG_HS)
-	@echo "cTARGETPLATFORM       = \"$(TARGETPLATFORM)\"" >> $(CONFIG_HS)
-	@echo "cCURRENT_DIR          = \"$(CURRENT_DIR)\"" >> $(CONFIG_HS)
-	@echo "cHaveLibGmp           = \"$(HaveLibGmp)\"" >> $(CONFIG_HS)
-	@echo "cLibsReadline         = \"$(LibsReadline)\"" >> Config.hs
-	@echo "clibdir               = \"$(libdir)\"" >> $(CONFIG_HS)
-	@echo "cGHC_LIB_DIR          = \"$(GHC_LIB_DIR)\"" >> $(CONFIG_HS)
-	@echo "cGHC_RUNTIME_DIR      = \"$(GHC_RUNTIME_DIR)\"" >> $(CONFIG_HS)
-	@echo "cGHC_UTILS_DIR        = \"$(GHC_UTILS_DIR)\"" >> $(CONFIG_HS)
-	@echo "cGHC_INCLUDE_DIR      = \"$(GHC_INCLUDE_DIR)\"" >> $(CONFIG_HS)
-	@echo "cFPTOOLS_TOP_ABS      = \"$(FPTOOLS_TOP_ABS)\"" >> $(CONFIG_HS)
-	@echo done.
-
-CLEAN_FILES += $(CONFIG_HS)
-
-# -----------------------------------------------------------------------------
-# 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
 
 # -----------------------------------------------------------------------------