X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2FMakefile;h=715770a711d42e39c802af084e78e9fb94646ba9;hb=dc9cf6cfaa28078e86d250bbf17acb3008ce30fb;hp=9bfcedd915a131223c7d1525dce977d8f3336383;hpb=877aad486de6dcfac29ee647b79eeac930607381;p=ghc-hetmet.git

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index 9bfcedd..715770a 100644
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -1,18 +1,21 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.32 2000/06/13 16:07:20 simonmar Exp $
+# $Id: Makefile,v 1.40 2000/06/30 09:46:04 simonmar Exp $
 #
 
 TOP=..
 CURRENT_DIR=ghc/driver
 include $(TOP)/mk/boilerplate.mk
 
-ifneq "$(GhcWithHscBuiltViaC)" "YES"
-HC=$(WithGhcHc)
-else
+ifeq "$(GhcWithHscBuiltViaC)" "YES"
 HC=$(GHC_INPLACE)
 endif
 
-SRC_HC_OPTS += -fglasgow-exts -cpp -syslib concurrent -syslib posix -syslib text
+ghc_406_at_least = $(shell expr "$(GhcMinVersion)" \>= 6)
+ifeq "$(ghc_406_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
+endif
 
 HS_PROG = ghc-$(ProjectVersion)
 HS_SRCS = Config.hs Package.hs Main.hs
@@ -30,64 +33,48 @@ Config.hs : $(FPTOOLS_TOP)/mk/config.mk Makefile
 	@$(RM) -f Config.hs
 	@echo -n "Creating Config.hs ... "
 	@echo "module Config where" >>Config.hs
-	@echo "_ProjectName          = \"$(ProjectName)\"" >> Config.hs            
-	@echo "_ProjectVersion       = \"$(ProjectVersion)\"" >> Config.hs         
-	@echo "_ProjectVersionInt    = \"$(ProjectVersionInt)\"" >> Config.hs      
-	@echo "_ProjectPatchLevel    = \"$(ProjectPatchLevel)\"" >> Config.hs      
-	@echo "_HOSTPLATFORM         = \"$(HOSTPLATFORM)\"" >> Config.hs           
-	@echo "_TARGETPLATFORM       = \"$(TARGETPLATFORM)\"" >> Config.hs         
-	@echo "_CURRENT_DIR          = \"$(CURRENT_DIR)\"" >> Config.hs            
-	@echo "_GHC_LIB_DIR          = \"$(GHC_LIB_DIR)\"" >> Config.hs            
-	@echo "_GHC_RUNTIME_DIR      = \"$(GHC_RUNTIME_DIR)\"" >> Config.hs        
-	@echo "_GHC_UTILS_DIR        = \"$(GHC_UTILS_DIR)\"" >> Config.hs          
-	@echo "_GHC_INCLUDE_DIR      = \"$(GHC_INCLUDE_DIR)\"" >> Config.hs        
-	@echo "_GHC_DRIVER_DIR       = \"$(GHC_DRIVER_DIR)\"" >> Config.hs        
-	@echo "_GCC                  = \"$(WhatGccIsCalled)\"" >> Config.hs
-	@echo "_GhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> Config.hs   
-	@echo "_LeadingUnderscore    = \"$(LeadingUnderscore)\"" >> Config.hs      
-	@echo "_GHC_MKDEPENDHS       = \"$(GHC_MKDEPENDHS)\"" >> Config.hs
-	@echo "_GHC_UNLIT            = \"$(GHC_UNLIT)\"" >> Config.hs              
-	@echo "_GHC_HSCPP            = \"$(GHC_HSCPP)\"" >> Config.hs              
-	@echo "_GHC_HSC              = \"$(GHC_HSC)\"" >> Config.hs                
-	@echo "_GHC_MANGLER          = \"$(GHC_MANGLER)\"" >> Config.hs
-	@echo "_GHC_SPLIT            = \"$(GHC_SPLIT)\"" >> Config.hs
-	@echo "_GHC_STATS            = \"$(GHC_STATS)\"" >> Config.hs
-	@echo "_GHC_SYSMAN           = \"$(GHC_SYSMAN)\"" >> Config.hs             
-	@echo "_EnableWin32DLLs      = \"$(EnableWin32DLLs)\"" >> Config.hs        
-	@echo "_CP                   = \"$(CP)\"" >> Config.hs                     
-	@echo "_RM                   = \"$(RM)\"" >> Config.hs                     
-	@echo "_CONTEXT_DIFF         = \"$(CONTEXT_DIFF)\"" >> Config.hs           
-	@echo "_HaveLibGmp           = \"$(HaveLibGmp)\"" >> Config.hs
-	@echo "_GhcWithRegisterised  = \"$(GhcWithRegisterised)\"" >> Config.hs    
-	@echo "_USER_WAY_NAMES       = \"$(USER_WAY_NAMES)\"" >> Config.hs         
-	@echo "_USER_WAY_OPTS        = \"$(USER_WAY_OPTS)\"" >> Config.hs          
-	@echo "_libdir               = \"$(libdir)\"" >> Config.hs                 
-	@echo "_libexecdir           = \"$(libexecdir)\"" >> Config.hs             
-	@echo "_datadir              = \"$(datadir)\"" >> Config.hs                
-	@echo "_bindir               = \"$(bindir)\"" >> Config.hs                 
-	@echo "_TMPDIR               = \"$(TMPDIR)\"" >> Config.hs                 
-	@echo "_FPTOOLS_TOP_ABS      = \"$(FPTOOLS_TOP_ABS)\"" >> 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 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;
-
-# -----------------------------------------------------------------------------
 # create ghc-inplace, a convenient way to run ghc from the build tree...
 
 all :: ghc-inplace
@@ -95,9 +82,11 @@ all :: ghc-inplace
 ghc-inplace : ghc
 	@$(RM) $@
 	echo '#!/bin/sh' >>$@
-	echo exec $(FPTOOLS_TOP_ABS)/ghc/driver/ghc -B$(FPTOOLS_TOP_ABS) $$\* >>$@
+	echo exec $(FPTOOLS_TOP_ABS)/ghc/driver/ghc -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@
 	chmod 755 $@
 
+CLEAN_FILES += ghc-inplace
+
 # -----------------------------------------------------------------------------
 # package configuration files...
 
@@ -119,7 +108,7 @@ CLEAN_FILES += pkgconf package.conf.inplace package.conf
 # -----------------------------------------------------------------------------
 # installation...
 
-INSTALL_PROGS = ghc
+INSTALL_PROGS = ghc-$(ProjectVersion)
 
 override datadir=$(libdir)
 INSTALL_DATAS += ghc-usage.txt
@@ -127,3 +116,35 @@ 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;