X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fopts.mk;h=0c4fd8a7f3077ed7e5358e7c596cd91ecff3f01f;hb=8f3eae42434c77b622051936b8f98bbfaa3d6397;hp=837fe4829e31e00211df09c82cfc4cc5f31f9371;hpb=9f201152779e7d931b016163e0abb3a81cf5a02e;p=ghc-hetmet.git

diff --git a/mk/opts.mk b/mk/opts.mk
index 837fe48..0c4fd8a 100644
--- a/mk/opts.mk
+++ b/mk/opts.mk
@@ -5,7 +5,7 @@
 #	This file defines Make variables for the
 #	option flags for each utility program
 #
-# 	$Id: opts.mk,v 1.3 1997/08/22 16:13:01 reid Exp $
+# 	$Id: opts.mk,v 1.7 1998/06/11 18:43:55 sof Exp $
 #
 #################################################################################
 
@@ -24,16 +24,19 @@
 #
 # P_OPTS is always defined like this:
 #
-# P_OPTS = SRC_P_OPTS WAY$(_way)_P_OPTS BUILD_P_OPTS EXTRA_P_OPTS
+# P_OPTS = SRC_P_OPTS WAY$(_way)_P_OPTS EXTRA_P_OPTS
 #
 # where the variables on the right hand side are set by the user or
 # some other Makefile.  They have the following intended uses:
 #
 #	SRC_P_OPTS		Source-tree options for P
 #	WAY$(_way)_P_OPTS	Source-tree options for P specific to $(way)
-#	BUILD_P_OPTS		Build-tree options for P
 #	EXTRA_P_OPTS		Command-line options for P
 #
+# and for some programs
+#
+#       $($*_P_OPTS)            Target specific options for P
+#
 # All these options should be set with
 #	thing += extra-options
 # in case someone higher up the include hierarchy has already added some
@@ -46,7 +49,7 @@
 #################################################################################
 
 # These flags make flex 8-bit
-SRC_FLEX_OPTS	+= -s -8
+SRC_FLEX_OPTS	+= -8
 
 #
 # Make sure we install things with group 'grasp' at Glasgow
@@ -80,9 +83,9 @@ SRC_TEXI2HTML_OPTS +=-menu -verbose -glossary
 # All the standard gluing together, as in the comment right at the front
 
 
-# For the Haskell compiler and runtests we do something a bit special:
-# we also include target-specific flags
 HC_OPTS            = $(SRC_HC_OPTS) $(WAY$(_way)_HC_OPTS) $($*_HC_OPTS) $(EXTRA_HC_OPTS)
+HC_POST_OPTS       = $(SRC_HC_POST_OPTS) $(WAY$(_way)_HC_POST_OPTS) $($*_HC_POST_OPTS) $(EXTRA_HC_POST_OPTS)
+HC_PRE_OPTS        = $(SRC_HC_PRE_OPTS) $(WAY$(_way)_HC_PRE_OPTS) $($*_HC_PRE_OPTS) $(EXTRA_HC_PRE_OPTS)
 
 RUNTEST_OPTS       = $(SRC_RUNTEST_OPTS) $(WAY$(_way)_RUNTEST_OPTS) \
                      $($*_RUNTEST_OPTS) $(EXTRA_RUNTEST_OPTS)
@@ -115,3 +118,4 @@ MKDEPENDLIT_OPTS   = $(SRC_MKDEPENDLIT_OPTS) $(WAY$(_way)_MKDEPENDLIT_OPTS) \
 UGEN_OPTS          = $(SRC_UGEN_OPTS) $(WAY$(_way)_UGEN_OPTS) $(EXTRA_UGEN_OPTS)
 UNLIT_OPTS         = $(SRC_UNLIT_OPTS) $(WAY$(_way)_UNLIT_OPTS) $(EXTRA_UNLIT_OPTS)
 YACC_OPTS          = $(SRC_YACC_OPTS) $(WAY$(_way)_YACC_OPTS) $(EXTRA_YACC_OPTS)
+ZIP_OPTS           = $(SRC_ZIP_OPTS) $(EXTRA_ZIP_OPTS)