X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2FMakefile;h=3e919d2abfac6fbe3d6dc33462c18226f30b7bcf;hb=86ef046e3c6008aaa7a614a0072e11f41aa40c3a;hp=20568929406769fb554de4386a3e805338b27a4c;hpb=e2b9618c869c3cb8e346f1426a84a7ad3bbd77df;p=ghc-hetmet.git

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index 2056892..3e919d2 100644
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -1,15 +1,32 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.42 2000/07/17 15:25:05 rrt Exp $
+# $Id: Makefile,v 1.58 2001/03/27 08:29:07 qrczak 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
 
+# -----------------------------------------------------------------------------
+# package configuration files...
+
+PKGCONF_OPTS = "$(TARGETPLATFORM)"		\
+	       "$(CURRENT_DIR)"			\
+	       "$(HaveLibGmp)"			\
+	       "$(LibsReadline)"		\
+	       "$(libdir)"			\
+	       "$(GHC_LIB_DIR)"			\
+	       "$(GHC_RUNTIME_DIR)"		\
+	       "$(GHC_UTILS_DIR)"		\
+	       "$(GHC_INCLUDE_DIR)"		\
+	       "$(FPTOOLS_TOP_ABS)"
+
 ghc_407_at_least = $(shell expr "$(GhcMinVersion)" \>= 7)
 ifeq "$(ghc_407_at_least)" "1"
 ifneq "$(mingw32_TARGET_OS)" "1"
@@ -21,134 +38,26 @@ else
 SRC_HC_OPTS += -fglasgow-exts -cpp -syslib concurrent -syslib posix -syslib misc
 endif
 
-HS_PROG = ghc-$(ProjectVersion)
-HS_SRCS = Config.hs Package.hs Main.hs
-MKDEPENDHS_SRCS = Config.hs Main.hs PackageSrc.hs
-LINK = ghc
-
-SUBDIRS = mangler split stats
-
-# -----------------------------------------------------------------------------
-# Create driver configuration
-
-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 "cProjectName          = \"$(ProjectName)\"" >> Config.hs            
-	@echo "cProjectVersion       = \"$(ProjectVersion)\"" >> Config.hs         
-	@echo "cProjectVersionInt    = \"$(ProjectVersionInt)\"" >> Config.hs      
-	@echo "cProjectPatchLevel    = \"$(ProjectPatchLevel)\"" >> Config.hs      
-	@echo "cHOSTPLATFORM         = \"$(HOSTPLATFORM)\"" >> Config.hs           
-	@echo "cTARGETPLATFORM       = \"$(TARGETPLATFORM)\"" >> Config.hs         
-	@echo "cCURRENT_DIR          = \"$(CURRENT_DIR)\"" >> 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 "cGHC_DRIVER_DIR       = \"$(GHC_DRIVER_DIR)\"" >> Config.hs        
-	@echo "cGCC                  = \"$(WhatGccIsCalled)\"" >> Config.hs
-	@echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> Config.hs   
-	@echo "cLeadingUnderscore    = \"$(LeadingUnderscore)\"" >> Config.hs      
-	@echo "cGHC_MKDEPENDHS       = \"$(GHC_MKDEPENDHS)\"" >> Config.hs
-	@echo "cGHC_UNLIT            = \"$(GHC_UNLIT)\"" >> Config.hs              
-	@echo "cGHC_HSC              = \"$(GHC_HSC)\"" >> Config.hs                
-	@echo "cGHC_MANGLER          = \"$(GHC_MANGLER)\"" >> Config.hs
-	@echo "cGHC_SPLIT            = \"$(GHC_SPLIT)\"" >> Config.hs
-	@echo "cGHC_STATS            = \"$(GHC_STATS)\"" >> Config.hs
-	@echo "cGHC_SYSMAN           = \"$(GHC_SYSMAN)\"" >> Config.hs             
-	@echo "cEnableWin32DLLs      = \"$(EnableWin32DLLs)\"" >> Config.hs        
-	@echo "cCP                   = \"$(CP)\"" >> Config.hs                     
-	@echo "cRM                   = \"$(RM)\"" >> Config.hs                     
-	@echo "cCONTEXT_DIFF         = \"$(CONTEXT_DIFF)\"" >> Config.hs           
-	@echo "cHaveLibGmp           = \"$(HaveLibGmp)\"" >> Config.hs
-	@echo "cGhcWithRegisterised  = \"$(GhcWithRegisterised)\"" >> Config.hs    
-	@echo "cUSER_WAY_NAMES       = \"$(USER_WAY_NAMES)\"" >> Config.hs         
-	@echo "cUSER_WAY_OPTS        = \"$(USER_WAY_OPTS)\"" >> Config.hs          
-	@echo "clibdir               = \"$(libdir)\"" >> Config.hs                 
-	@echo "clibexecdir           = \"$(libexecdir)\"" >> Config.hs             
-	@echo "cdatadir              = \"$(datadir)\"" >> Config.hs                
-	@echo "cbindir               = \"$(bindir)\"" >> Config.hs                 
-	@echo "cTMPDIR               = \"$(TMPDIR)\"" >> Config.hs                 
-	@echo "cFPTOOLS_TOP_ABS      = \"$(FPTOOLS_TOP_ABS)\"" >> Config.hs
-	@echo "cRAWCPP               = \"$(RAWCPP)\"" >> Config.hs
-	@echo done.
-
-CLEAN_FILES += Config.hs
-
-# -----------------------------------------------------------------------------
-# create ghc-inplace, a convenient way to run ghc from the build tree...
-
-all :: ghc-inplace
-
-ghc-inplace : ghc
-	@$(RM) $@
-	echo '#!/bin/sh' >>$@
-	echo exec $(FPTOOLS_TOP_ABS)/ghc/driver/ghc -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@
-	chmod 755 $@
-
-CLEAN_FILES += ghc-inplace
-
-# -----------------------------------------------------------------------------
-# package configuration files...
+SRC_HC_OPTS += -DWANT_PRETTY
 
 all :: package.conf package.conf.inplace
 
-pkgconf : Config.o Package.o PackageSrc.o
-	$(HC) $(HC_OPTS) $(LD_OPTS) Config.o Package.o PackageSrc.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) >$@
+
+Package.o : ../utils/ghc-pkg/Package.hs
 
+override datadir = $(libdir)
 INSTALL_DATAS += package.conf
 
 CLEAN_FILES += pkgconf package.conf.inplace package.conf
 
 # -----------------------------------------------------------------------------
-# installation...
-
-INSTALL_PROGS = ghc-$(ProjectVersion)
-
-override datadir=$(libdir)
-INSTALL_DATAS += ghc-usage.txt
-
-# -----------------------------------------------------------------------------
 
 include $(TOP)/mk/target.mk
-
-# we need the driver for generating dependencies...
-boot :: all
-
-# -----------------------------------------------------------------------------
-# Create link to from ghc-x.xx to ghc...
-
-all :: $(LINK)
-
-$(LINK) : $(HS_PROG)
-	@if ( $(PERL) -e '$$fn="$(LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
-	   echo "Creating a symbolic link from $(HS_PROG) to $(LINK)"; \
-	   $(RM) $(LINK); \
-	   $(LN_S) $(HS_PROG) $(LINK); \
-	 else \
-	   echo "Creating a symbolic link from $(HS_PROG) to $(LINK) failed: \`$(LINK)' already exists"; \
-	   echo "Perhaps remove \`$(LINK)' manually?"; \
-	   exit 1; \
-	 fi;
-
-CLEAN_FILES += $(LINK)
-
-install ::
-	@if ( $(PERL) -e '$$fn="$(bindir)/$(LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
-	   echo "Creating a symbol link from $(HS_PROG) to $(LINK) in $(bindir)"; \
-	   $(RM) $(bindir)/$(LINK); \
-	   $(LN_S) $(HS_PROG) $(bindir)/$(LINK); \
-	 else \
-	   echo "Creating a symbol link from $(HS_PROG) to $(LINK) in $(bindir) failed: \`$(bindir)/$(LINK)' already exists"; \
-	   echo "Perhaps remove \`$(bindir)/$(LINK)' manually?"; \
-	   exit 1; \
-	 fi;