X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2FMakefile;h=f24a04b4813a1875cada7af0bc2354af4e3046ab;hb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;hp=d2e0077d02d0d732cdcc3673f676629d1a080ff2;hpb=1fb1ab5d53a09607e7f6d2450806760688396387;p=ghc-hetmet.git

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index d2e0077..f24a04b 100644
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -1,28 +1,26 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.3 1997/03/14 07:59:40 simonpj Exp $
+#
 
 TOP=..
 CURRENT_DIR=ghc/driver
 include $(TOP)/mk/boilerplate.mk
-
-#
-# The ways setup doesn't apply to the driver
 #
-WAYS=
+# The driver needs to get at the version
+include $(TOP)/mk/version.mk
 
 INSTALLING=0
 
 DYN_LOADABLE_BITS = \
 	ghc-asm.prl \
-	ghc-recomp.prl \
 	ghc-iface.prl \
 	ghc-consist.prl \
 	ghc-split.prl
 
-SCRIPT_PROG = ghc
+SCRIPT_PROG = ghc-$(ProjectVersion)
+SCRIPT_LINK = ghc
 SCRIPT_OBJS = ghc.prl
  
-INTERP	= $(PERL)
+INTERP=perl
 
 #
 # The driver needs to know the options and names for 
@@ -41,12 +39,13 @@ endif
 
 SCRIPT_SUBST_VARS := \
   INSTALLING \
-  PROJECTNAME PROJECTVERSION PROJECTPATCHLEVEL \
-  CURRENT_DIR TMPDIR HOSTPLATFORM TARGETPLATFORM \
+  ProjectName ProjectVersion ProjectVersionInt ProjectPatchLevel \
+  HscMajorVersion HscMinorVersion CcMajorVersion CcMinorVersion \
+  CURRENT_DIR HOSTPLATFORM TARGETPLATFORM \
   GHC_LIB_DIR GHC_RUNTIME_DIR GHC_UTILS_DIR GHC_INCLUDE_DIR \
   GHC_OPT_HILEV_ASM GhcWithNativeCodeGen LeadingUnderscore\
   GHC_UNLIT GHC_HSCPP GHC_HSC GHC_SYSMAN \
-  CP RM PERL CONTEXT_DIFF \
+  CP RM CONTEXT_DIFF LibGmp \
   $(WAY_NAMES) $(WAY_OPTS)
 
 #
@@ -58,7 +57,7 @@ SCRIPT_SUBST_VARS := \
 ifeq "$(BIN_DIST)" "1"
 SCRIPT_PREFIX_FILES=prefix.txt
 else
-SCRIPT_SUBST_VARS += TOP_PWD INSTLIBDIR_GHC INSTDATADIR_GHC PERL
+SCRIPT_SUBST_VARS += libdir libexecdir datadir bindir TMPDIR TOP_PWD
 endif
 
 all :: $(DYN_LOADABLE_BITS)
@@ -70,8 +69,8 @@ all :: $(DYN_LOADABLE_BITS)
 #
 # ToDo: allow different install name for driver?
 #
-INSTALL_PROGS += $(SCRIPT_PROG)
-INSTALL_LIBS  += $(DYN_LOADABLE_BITS)
+INSTALL_SCRIPTS += $(SCRIPT_PROG)
+INSTALL_LIBS    += $(DYN_LOADABLE_BITS)
 
 #
 # Before really installing the driver, we have to
@@ -90,7 +89,7 @@ depend :: all
 #
 # Clean up
 #
-CLEAN_FILES += $(SCRIPT_OBJS) $(DYN_LOADABLE_BITS)
+CLEAN_FILES += $(SCRIPT_OBJS) $(SCRIPT_LINK) $(DYN_LOADABLE_BITS) ghc-[0-9].*
 
 #
 # Source distribution
@@ -99,17 +98,31 @@ SRC_DEST_FILES=$(patsubst %.prl,%.lprl,$(DYN_LOADABLE_BITS)) ghc.lprl ordering-p
 
 include $(TOP)/mk/target.mk
 
+ghc.prl : $(TOP)/mk/version.mk
+
 # Hack to re-create the in-situ build tree driver script after 
 # having installed it.
 #
 install ::
 	@$(RM) $(SCRIPT_PROG)
-	@$(MAKE) $(MFLAGS) BIN_DIST=0 $(SCRIPT_PROG)
+	@$(MAKE) $(MFLAGS) BIN_DIST=0 INSTALLING=0 $(SCRIPT_PROG)
 
+#
+# Another hack (hmm..I can see a pattern developing here :-)
+# In ghc/driver, we create a symlink from ghc-<whatever-version> to
+# ghc, but we don't want this included in a source distribution.
+# We `solve' this by removing `ghc' from the dist tree here.
+dist ::
+	@echo "Patching dist tree: removing $(SRC_DIST_DIR)/ghc symlink"
+	$(RM) $(SRC_DIST_DIR)/ghc
 
 #
-# Option vars for the special ways
+# Option vars for the special ways (that the driver has special pleading for).
 #
+# ToDo: rename -DPROFILING to -D__SCC_PROFILING (or somesuch)
+#              -DTICKY-TICKY TO __TICKY_TICKY__
+#
+#  (this is to make the naming consistent with other `standard' hscpp #defines )
 
 # Way p:
 WAY_p_NAME=profiling
@@ -123,27 +136,15 @@ WAY_t_HC_OPTS=-fticky-ticky -DTICKY_TICKY -optc-DTICKY_TICKY
 WAY_u_NAME=unregisterized (using portable C only)
 WAY_u_HC_OPTS=
 
-# Way `mc': concurrent
-WAY_mc_NAME=concurrent
-WAY_mc_HC_OPTS+=-fstack-check -fconcurrent -D__CONCURRENT_HASKELL__ -DCONCURRENT -optcpp-D__CONCURRENT_HASKELL__ -optcpp-DCONCURRENT
-
-# Way `mr': 
-WAY_mr_NAME=profiled concurrent
-WAY_mr_HC_OPTS+=-fstack-check -fconcurrent -fscc-profiling -D__CONCURRENT_HASKELL__ -DCONCURRENT -DPROFILING -optcpp-D__CONCURRENT_HASKELL__ -optcpp-DCONCURRENT -optcpp-DPROFILING
-
-# Way `mt': 
-WAY_mt_NAME=ticky-ticky concurrent
-WAY_mt_HC_OPTS+=-fstack-check -fconcurrent -fticky-ticky -D__CONCURRENT_HASKELL__ -DCONCURRENT -DTICKY-TICKY -optc-D__CONCURRENT_HASKELL__ -optc-DCONCURRENT -optc-DTICKY_TICKY
-
 # Way `mp': 
 WAY_mp_NAME=parallel
-WAY_mp_HC_OPTS+=-fstack-check -fconcurrent -D__PARALLEL_HASKELL__ -DPAR -optcpp-D__PARALLEL_HASKELL__ -optc-DPAR -optc-DCONCURRENT
+WAY_mp_HC_OPTS+=-fstack-check -fparallel -D__PARALLEL_HASKELL__ -optc-DPAR
 
 #
 # Way `mg': 
-#  Q: is passing -D__GRANSIM__ and -DGRAN to hscpp needed?
+#  Q: is passing -D__GRANSIM__ and -DGRAN to hscpp needed? No, just -D__GRANSIM__
 WAY_mg_NAME=GranSim
-WAY_mg_HC_OPTS+=-fstack-check -fconcurrent -fgransim -D__GRANSIM__ -DGRAN -optcpp-D__GRANSIM__ -optc-DGRAN -optc-D__CONCURRENT_HASKELL__ -optc-DCONCURRENT
+WAY_mg_HC_OPTS+=-fstack-check -fconcurrent -fgransim -D__GRANSIM__ -D__CONCURRENT_HASKELL__ -optc-DCONCURRENT -optc-DGRAN
 
 #
 # Ways for different garbage collectors