[project @ 2002-06-24 14:35:28 by simonmar]

[ghc-hetmet.git] / mk / opts.mk

diff --git a/mk/opts.mk b/mk/opts.mk
index 3c780de..b4fd0cb 100644 (file)
--- 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.26 2001/08/15 09:22:19 rrt Exp $
+#      $Id: opts.mk,v 1.30 2002/06/24 14:35:28 simonmar Exp $
 #
 #################################################################################
 
@@ -48,28 +48,6 @@
 
 #################################################################################
 #
-#              Global option flags for utilities
-#
-#################################################################################
-
-# These flags make flex 8-bit
-SRC_FLEX_OPTS  += -8
-
-SRC_INSTALL_BIN_OPTS   += -s
-
-# lint gets all CPP's flags too
-SRC_LINT_OPTS          += -axz -DLINT $(SRC_CPP_OPTS)
-WAY$(_way)_LINT_OPTS   += WAY$(_way)_CPP_OPTS
-
-# Default fptools options for dllwrap.
-SRC_BLD_DLL_OPTS += -mno-cygwin -mwin32 --target=i386-mingw32
-
-# Flags for CPP when running GreenCard on .pgc files
-GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__
-
-
-#################################################################################
-#
 #              Absolutely standard glue
 #
 #################################################################################
@@ -94,6 +72,7 @@ CPP_OPTS           = $(SRC_CPP_OPTS) $(WAY$(_way)_CPP_OPTS) $(EXTRA_CPP_OPTS)
 CTAGS_OPTS         = $(SRC_CTAGS_OPTS) $(WAY$(_way)_CTAGS_OPTS) $(EXTRA_CTAGS_OPTS)
 CC_OPTS            = $(SRC_CC_OPTS) $(WAY$(_way)_CC_OPTS) $($*_CC_OPTS) $(EXTRA_CC_OPTS)
 FLEX_OPTS          = $(SRC_FLEX_OPTS) $(WAY$(_way)_FLEX_OPTS) $(EXTRA_FLEX_OPTS)
+HADDOCK_OPTS       = $(SRC_HADDOCK_OPTS) $(WAY$(_way)_HADDOCK_OPTS) $($*_HADDOCK_OPTS) $(EXTRA_HADDOCK_OPTS)
 HAPPY_OPTS         = $(SRC_HAPPY_OPTS) $(WAY$(_way)_HAPPY_OPTS) $($*_HAPPY_OPTS) $(EXTRA_HAPPY_OPTS)
 GC_OPTS            = $(SRC_GC_OPTS) $(WAY$(_way)_GC_OPTS) $($*_GC_OPTS) $(EXTRA_GC_OPTS)
 HSTAGS_OPTS        = $(SRC_HSTAGS_OPTS) $(WAY$(_way)_HSTAGS_OPTS) $(EXTRA_HSTAGS_OPTS)
@@ -122,3 +101,6 @@ SGML2HTML_OPTS     = $(SRC_SGML2HTML_OPTS) $(WAY$(_way)_SGML2HTML_OPTS) $(EXTRA_
 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)
+
+# Version of CC_OPTS to use when GHC is the C compiler
+GHC_CC_OPTS       = $(addprefix -optc, $(CC_OPTS)) $(HC_OPTS)