X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2FMakefile;h=524abd43d461f9f9848a9f56d12ee3016d9f0571;hb=e95a551db710952fd25736055ea889eb8d65141a;hp=d6571ec632c5aa36e6c20765110f0d73517f4c05;hpb=f5448f5c5efe0630cb865ee0d21691a23ea932d3;p=ghc-hetmet.git

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index d6571ec..524abd4 100644
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.45 2000/11/07 10:42:56 simonmar Exp $
+# $Id: Makefile,v 1.50 2000/12/20 10:42:54 simonmar Exp $
 #
 
 TOP=..
@@ -21,74 +21,32 @@ else
 SRC_HC_OPTS += -fglasgow-exts -cpp -syslib concurrent -syslib posix -syslib misc
 endif
 
-HS_PROG = ghc-$(ProjectVersion)
-HS_SRCS = Config.hs Package.hs GetImports.hs Main.hs Utils.hs
-MKDEPENDHS_SRCS = Config.hs Main.hs GetImports.hs PackageSrc.hs Utils.hs
-LINK = ghc
-
-SUBDIRS = mangler split stats
+SUBDIRS = mangler split
 
 # -----------------------------------------------------------------------------
-# 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 "cHscIfaceFileVersion  = \"$(HscIfaceFileVersion)\"" >> 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_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 "cDLLized              = \"$(DLLized)\"" >> 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 "cDEFAULT_TMPDIR       = \"$(DEFAULT_TMPDIR)\"" >> Config.hs
-	@echo "cFPTOOLS_TOP_ABS      = \"$(FPTOOLS_TOP_ABS)\"" >> Config.hs
-	@echo "cRAWCPP               = \"$(RAWCPP)\"" >> Config.hs
+# 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
-
-# -----------------------------------------------------------------------------
-# 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
+CLEAN_FILES += $(CONFIG_HS)
 
 # -----------------------------------------------------------------------------
 # package configuration files...
@@ -111,47 +69,9 @@ 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...  so build it as
-# part of make boot.  We need to do this using a recursive invocation
-# of $(MAKE), so that dependencies we just generated for the driver
-# itself are picked up.
-boot ::
-	$(MAKE) $(MFLAGS) 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;