X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2FMakefile;h=a7667bfb26c8baaee74571abe99bd5d007b191c9;hb=7fe540d8c382712d2eab02a05556ed168311ae2e;hp=f81e3b331d4355acdd4860522ddc79ecc1ba8e8c;hpb=07080fd8df2efba05acc475999fa00473af604e4;p=ghc-hetmet.git

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index f81e3b3..a7667bf 100644
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -1,150 +1,67 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.41 2000/07/06 09:35:37 simonmar Exp $
 #
 
 TOP=..
 CURRENT_DIR=ghc/driver
 include $(TOP)/mk/boilerplate.mk
 
-ifeq "$(GhcWithHscBuiltViaC)" "YES"
-HC=$(GHC_INPLACE)
-endif
+# hack for ghci-inplace script, see below
+INSTALLING=1
 
-ghc_407_at_least = $(shell expr "$(GhcMinVersion)" \>= 7)
-ifeq "$(ghc_407_at_least)" "1"
-SRC_HC_OPTS += -fglasgow-exts -cpp -package concurrent -package posix -package text
-else
-SRC_HC_OPTS += -fglasgow-exts -cpp -syslib concurrent -syslib posix -syslib misc
+ifeq "$(INSTALLING)" "1"	
+SUBDIRS = mangler split ghc ghci
 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
+# package configuration files...
 
-# -----------------------------------------------------------------------------
-# create ghc-inplace, a convenient way to run ghc from the build tree...
+PKGCONF_OPTS = "$(TARGETPLATFORM)"		\
+	       "$(CURRENT_DIR)"			\
+	       "$(HaveLibGmp)"			\
+	       "$(LibsReadline)"		\
+	       "$(GHC_LIB_DIR)"			\
+	       "$(GHC_RUNTIME_DIR)"		\
+	       "$(GHC_UTILS_DIR)"		\
+	       "$(GHC_INCLUDE_DIR)"		\
+	       "$(X_CFLAGS)"			\
+	       "$(X_LIBS)"
 
-all :: ghc-inplace
+# the latter two are needed to setup the package details for hslibs/xlib
 
-ghc-inplace : ghc
-	@$(RM) $@
-	echo '#!/bin/sh' >>$@
-	echo exec $(FPTOOLS_TOP_ABS)/ghc/driver/ghc -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@
-	chmod 755 $@
+SRC_HC_OPTS += -fglasgow-exts -cpp 
 
-CLEAN_FILES += ghc-inplace
+ghc_407_at_least = $(shell if (test $(GhcCanonVersion) -ge 407); then echo YES; else echo NO; fi)
 
-# -----------------------------------------------------------------------------
-# package configuration files...
+ifeq "$(ghc_407_at_least)" "YES"
+SRC_HC_OPTS += -package concurrent -package text
+ifneq "$(mingw32_TARGET_OS)" "1"
+SRC_HC_OPTS += -package posix
+endif
+else
+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
 
-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) >$@
 
-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
 
-INSTALL_PROGS = ghc-$(ProjectVersion)
-
-override datadir=$(libdir)
-INSTALL_DATAS += ghc-usage.txt
+CLEAN_FILES += Main.hi pkgconf package.conf.inplace package.conf
 
 # -----------------------------------------------------------------------------
 
 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;